fix(dependency): fix package_url

Subfolder was missing from the url when created from version.json file.
pollination · May 21, 2020 · 5b6b0c0 · 5b6b0c0
1 parent d509da7
commit 5b6b0c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/queenbee/base/io.py b/queenbee/base/io.py
@@ -34,7 +34,6 @@ class IOBase(BaseModel):
 
     artifacts: List[IOItem]
 
-    @classmethod
     @validator('parameters', 'artifacts')
     def parameter_unique_names(cls, v):
         """Pydantic validator to check that IO item names are unique within their list

diff --git a/queenbee/repository/package.py b/queenbee/repository/package.py
@@ -137,15 +137,20 @@ def from_package(cls, package_path: str):
         Returns:
             ResourceVersion -- A resource version object
         """
-        file_path = os.path.abspath(package_path)
+        file_path = os.path.normpath(os.path.abspath(package_path))
 
         tar_file = TarFile.open(file_path)
 
         member = tar_file.getmember('version.json')
 
         version_bytes = tar_file.extractfile(member).read()
 
-        return cls.parse_raw(version_bytes)
+        cls_ = cls.parse_raw(version_bytes)
+
+        # add subfolder (e.g. operators, recipes ) to url
+        cls_.url = '/'.join(file_path.split(os.sep)[-2:])
+
+        return cls_
 
     @staticmethod
     def path_to_readme(folder_path: str) -> str: