Fixes

src/poetry/console/commands/add.py

@@ -155,6 +155,8 @@ def handle(self) -> int:
             if "version" in _constraint:
                 # Validate version constraint
                 parse_constraint(_constraint["version"])
+            if "subdirectory" in _constraint and _constraint["subdirectory"] is None:
+                del _constraint["subdirectory"]
 
             constraint = inline_table()
             for name, value in _constraint.items():

src/poetry/console/commands/init.py

@@ -433,7 +433,7 @@ def _parse_requirements(self, requirements: list[str]) -> list[dict[str, Any]]:
                     if parsed.rev:
                         pair["rev"] = url.revision
 
-                    if hasattr(parsed, "subdirectory"):
+                    if parsed.subdirectory:
                         pair["subdirectory"] = url.subdirectory
 
                     if extras:
@@ -545,6 +545,11 @@ def _format_requirements(
             if "version" in requirement and len(requirement) == 1:
                 constraint = requirement["version"]
             else:
+                if (
+                    "subdirectory" in requirement
+                    and requirement["subdirectory"] is None
+                ):
+                    del requirement["subdirectory"]
                 constraint = inline_table()
                 constraint.trivia.trail = "\n"
                 constraint.update(requirement)

src/poetry/console/commands/plugin/add.py

@@ -136,6 +136,8 @@ def handle(self) -> int:
             if "version" in plugin:
                 # Validate version constraint
                 parse_constraint(plugin["version"])
+            if "subdirectory" in plugin and plugin["subdirectory"] is None:
+                del plugin["subdirectory"]
 
             constraint = tomlkit.inline_table()
             for name, value in plugin.items():

src/poetry/installation/executor.py

@@ -603,7 +603,7 @@ def _install_git(self, operation: Install | Update) -> int:
 
         # Now we just need to install from the source directory
         original_url = package.source_url
-        if hasattr(package, "source_subdirectory"):
+        if package.source_subdirectory:
             package._source_url = str(src_dir / Path(package.source_subdirectory))
         else:
             package._source_url = str(src_dir)

src/poetry/packages/locker.py

@@ -583,7 +583,7 @@ def _dump_package(self, package: Package) -> dict:
             if package.source_resolved_reference:
                 data["source"]["resolved_reference"] = package.source_resolved_reference
 
-            if hasattr(package, "source_subdirectory"):
+            if package.source_subdirectory:
                 data["source"]["source_subdirectory"] = package.source_subdirectory
 
             if package.source_type in ["directory", "git"]:

src/poetry/puzzle/provider.py

@@ -174,15 +174,13 @@ def search_for_vcs(self, dependency: VCSDependency) -> list[Package]:
         if dependency in self._deferred_cache:
             return [self._deferred_cache[dependency]]
 
-        directory = dependency.directory if hasattr(dependency, "directory") else None
-
         package = self.get_package_from_vcs(
             dependency.vcs,
             dependency.source,
             branch=dependency.branch,
             tag=dependency.tag,
             rev=dependency.rev,
-            directory=directory,
+            directory=dependency.directory,
             name=dependency.name,
         )
         package.develop = dependency.develop