Use nested_file for recursive parsing

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

src/python_inspector/api.py

@@ -121,36 +121,21 @@ def resolve_dependencies(
     if PYPI_SIMPLE_URL not in index_urls:
         index_urls = tuple([PYPI_SIMPLE_URL]) + tuple(index_urls)
 
-    known_files = {*requirement_files}
-    visited_files = set()
-    while True:
-        unvisited_files = known_files - visited_files
-        for req_file in unvisited_files:
-            deps = dependencies.get_dependencies_from_requirements(requirements_file=req_file)
-            for extra_data in dependencies.get_extra_data_from_requirements(
-                requirements_file=req_file
-            ):
-                index_urls = (*index_urls, *tuple(extra_data.get("extra_index_urls") or []))
-                recursive_files = extra_data.get("requirements") or []
-            direct_dependencies.extend(deps)
-            dirname = os.path.dirname(req_file)
-            recursive_files = [os.path.join(dirname, f) for f in recursive_files]
-            package_data = [
-                pkg_data.to_dict()
-                for pkg_data in PipRequirementsFileHandler.parse(location=req_file)
-            ]
-            files.append(
-                dict(
-                    type="file",
-                    path=req_file,
-                    package_data=package_data,
-                )
+    for req_file in requirement_files:
+        deps = dependencies.get_dependencies_from_requirements(requirements_file=req_file)
+        for extra_data in dependencies.get_extra_data_from_requirements(requirements_file=req_file):
+            index_urls = (*index_urls, *tuple(extra_data.get("extra_index_urls") or []))
+        direct_dependencies.extend(deps)
+        package_data = [
+            pkg_data.to_dict() for pkg_data in PipRequirementsFileHandler.parse(location=req_file)
+        ]
+        files.append(
+            dict(
+                type="file",
+                path=req_file,
+                package_data=package_data,
             )
-            visited_files.add(req_file)
-            known_files.update(recursive_files)
-
-        if known_files == visited_files:
-            break
+        )
 
     for specifier in specifiers:
         dep = dependencies.get_dependency(specifier=specifier)

src/python_inspector/dependencies.py

@@ -15,8 +15,7 @@
 
 from _packagedcode import models
 from _packagedcode.pypi import PipRequirementsFileHandler
-from _packagedcode.pypi import PythonSetupPyHandler
-from python_inspector.resolution import get_requirements_from_distribution
+from _packagedcode.pypi import get_requirements_txt_dependencies
 
 """
 Utilities to resolve dependencies .
@@ -30,14 +29,16 @@ def get_dependencies_from_requirements(requirements_file="requirements.txt"):
     Yield DependentPackage for each requirement in a `requirement`
     file.
     """
-    for package_data in PipRequirementsFileHandler.parse(location=requirements_file):
-        for dependent_package in package_data.dependencies:
-            if TRACE:
-                print(
-                    "dependent_package.extracted_requirement:",
-                    dependent_package.extracted_requirement,
-                )
-            yield dependent_package
+    dependent_packages, _ = get_requirements_txt_dependencies(
+        location=requirements_file, include_nested=True
+    )
+    for dependent_package in dependent_packages:
+        if TRACE:
+            print(
+                "dependent_package.extracted_requirement:",
+                dependent_package.extracted_requirement,
+            )
+        yield dependent_package
 
 
 def get_extra_data_from_requirements(requirements_file="requirements.txt"):

tests/data/test-api-with-recursive-requirement-file.json

@@ -109,70 +109,6 @@
           "purl": null
         }
       ]
-    },
-    {
-      "type": "file",
-      "path": "/home/tg1999/Desktop/python-inspector-1/tests/data/recursive_requirements/com.txt",
-      "package_data": [
-        {
-          "type": "pypi",
-          "namespace": null,
-          "name": null,
-          "version": null,
-          "qualifiers": {},
-          "subpath": null,
-          "primary_language": "Python",
-          "description": null,
-          "release_date": null,
-          "parties": [],
-          "keywords": [],
-          "homepage_url": null,
-          "download_url": null,
-          "size": null,
-          "sha1": null,
-          "md5": null,
-          "sha256": null,
-          "sha512": null,
-          "bug_tracking_url": null,
-          "code_view_url": null,
-          "vcs_url": null,
-          "copyright": null,
-          "license_expression": null,
-          "declared_license": null,
-          "notice_text": null,
-          "source_packages": [],
-          "file_references": [],
-          "extra_data": {},
-          "dependencies": [
-            {
-              "purl": "pkg:pypi/simplekml@1.3.5",
-              "extracted_requirement": "simplekml==1.3.5",
-              "scope": "install",
-              "is_runtime": true,
-              "is_optional": false,
-              "is_resolved": true,
-              "resolved_package": {},
-              "extra_data": {
-                "is_editable": false,
-                "link": null,
-                "hash_options": [],
-                "is_constraint": false,
-                "is_archive": null,
-                "is_wheel": false,
-                "is_url": null,
-                "is_vcs_url": null,
-                "is_name_at_url": false,
-                "is_local_path": null
-              }
-            }
-          ],
-          "repository_homepage_url": null,
-          "repository_download_url": null,
-          "api_data_url": null,
-          "datasource_id": "pip_requirements",
-          "purl": null
-        }
-      ]
     }
   ],
   "packages": [