Fixes and added support for importing Python packages like 'mypackage[options]'

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>

Author: mballance

src/ivpm/handlers/package_handler_python.py

@@ -417,13 +417,15 @@ def _write_requirements_txt(self,
                         packages_dir.replace("\\","/"), 
                         pkg.name))
                 else:
-                    # PyPi package
+                    # PyPi package — build PEP 508 specifier: name[extras]version
+                    extras = getattr(pkg, "extras", None)
+                    extras_str = "[%s]" % ",".join(extras) if extras else ""
                     if pkg.version is not None:
                         if pkg.version[0] in ['<','>','=']:
-                            fp.write("%s%s\n" % (pkg.name, pkg.version))
+                            fp.write("%s%s%s\n" % (pkg.name, extras_str, pkg.version))
                         else:
-                            fp.write("%s==%s\n" % (pkg.name, pkg.version))
+                            fp.write("%s%s==%s\n" % (pkg.name, extras_str, pkg.version))
                     else:
-                        fp.write("%s\n" % pkg.name)
+                        fp.write("%s%s\n" % (pkg.name, extras_str))
 
 

src/ivpm/package_updater.py

@@ -221,8 +221,9 @@ def _update_pkg(self, pkg : Package) -> Tuple[Package, ProjInfo]:
                 pkg.proj_info.target_dep_set = pkg.dep_set
                 pkg.proj_info.process_deps = pkg.process_deps
 
-            # Signal package complete
-            self.update_info.package_complete(pkg.name)
+            # Signal package complete, passing resolved version if available (e.g., gh-rls)
+            resolved_version = getattr(pkg, 'resolved_version', None)
+            self.update_info.package_complete(pkg.name, version=resolved_version)
 
             return (pkg, pkg.proj_info)
         except Exception as e:

src/ivpm/pkg_types/package_gh_rls.py

@@ -145,6 +145,9 @@ def _resolve_release(self):
             for r in rls_info:
                 if r["prerelease"] and not self.prerelease:
                     continue
+                # Skip releases with no usable assets (no assets, or all with broken untagged URLs)
+                if not self.source and not self._filter_valid_assets(r.get("assets", [])): 
+                    continue
                 rls = r
                 break
             if rls is None:
@@ -502,7 +505,7 @@ def _parse_linux_generic(self, name):
         if m:
             arch = m.group(1)
             # Normalize arch names
-            if arch in ("x86_64", "amd64"):
+            if arch in ("x86_64", "amd64", "x64"):
                 return "x86_64"
             elif arch in ("aarch_64", "aarch64", "arm64"):
                 return "aarch64"
@@ -619,7 +622,12 @@ def _has_binary_assets(self, assets):
                 return True
         return False
 
+    def _filter_valid_assets(self, assets):
+        """Filter out assets with broken untagged URLs (draft artifacts that weren't re-published)."""
+        return [a for a in assets if "untagged-" not in a.get("browser_download_url", "")]
+
     def _choose_source_url(self, rls):
+        """Return (url, forced_ext) for the source archive of a release, or (None, None)."""
         # Prefer tarball over zipball
         tarball = rls.get("tarball_url")
         if tarball:

src/ivpm/pkg_types/package_http.py

@@ -196,9 +196,10 @@ def _make_readonly(self, path: str):
 
     def _download_file(self, url, dest):
         r = httpx.get(url, follow_redirects=True)
+        if r.status_code < 200 or r.status_code >= 300:
+            raise Exception("Failed to download %s: HTTP %d" % (url, r.status_code))
         with open(dest, "wb") as f:
             f.write(r.content)
-        pass
 
     @staticmethod
     def create(name, opts, si) -> 'PackageHttp':

src/ivpm/pkg_types/package_pypi.py

@@ -26,6 +26,7 @@
 class PackagePyPi(Package):
     version : str = None
     resolved_version : str = None  # actual installed version after pip install
+    extras : list = None  # PEP 508 extras, e.g. ["litellm"] -> package[litellm]
 
     def process_options(self, opts, si):
         super().process_options(opts, si)
@@ -35,6 +36,13 @@ def process_options(self, opts, si):
         if "version" in opts.keys():
             self.version = opts["version"]
 
+        if "extras" in opts.keys():
+            raw = opts["extras"]
+            if isinstance(raw, list):
+                self.extras = [str(e) for e in raw]
+            else:
+                self.extras = [str(raw)]
+
     @staticmethod
     def create(name, opts, si) -> 'Package':
         pkg = PackagePyPi(name)

src/ivpm/project_ops_info.py

@@ -118,7 +118,7 @@ def package_start(self, name: str, pkg_type: str = None, pkg_src: str = None):
             self.event_dispatcher.dispatch(event)
         _logger.debug("Package start: %s", name)
 
-    def package_complete(self, name: str):
+    def package_complete(self, name: str, version: str = None):
         """Signal that loading of a package has completed."""
         duration = None
         if self._current_package_start and self._current_package_name == name:
@@ -129,7 +129,8 @@ def package_complete(self, name: str):
                 event_type=UpdateEventType.PACKAGE_COMPLETE,
                 package_name=name,
                 duration=duration,
-                cache_hit=self._current_cache_hit
+                cache_hit=self._current_cache_hit,
+                version=version
             )
             self.event_dispatcher.dispatch(event)
         _logger.debug("Package complete: %s (%.2fs)", name, duration or 0)

src/ivpm/update_event.py

@@ -45,6 +45,7 @@ class UpdateEvent:
     duration: Optional[float] = None
     cache_hit: Optional[bool] = None
     error_message: Optional[str] = None
+    version: Optional[str] = None
     total_packages: int = 0
     cache_hits: int = 0
     cache_misses: int = 0

src/ivpm/update_tui.py

@@ -42,6 +42,7 @@ def __init__(self, name: str, pkg_type: str, pkg_src: str):
         self.start_time = time.time()
         self.duration: Optional[float] = None
         self.cache_hit: Optional[bool] = None
+        self.version: Optional[str] = None
         self.completed = False
         self.error: Optional[str] = None
 
@@ -137,8 +138,9 @@ def _render(self):
             elif status.completed:
                 marker = Text("✓", style="bold green")
                 cache_str = "C" if status.cache_hit else ""
+                version_str = f"@{status.version}" if status.version else ""
                 duration_str = f"{status.duration:.1f}s" if status.duration else ""
-                info = Text(f"{status.pkg_type} {status.pkg_src} {cache_str} {duration_str}".strip())
+                info = Text(f"{status.pkg_type} {status.pkg_src} {version_str} {cache_str} {duration_str}".strip())
             else:
                 # Use Rich's Spinner for in-progress packages
                 marker = Spinner("dots", style="bold cyan")
@@ -198,6 +200,7 @@ def on_event(self, event: UpdateEvent):
                 status.completed = True
                 status.duration = event.duration
                 status.cache_hit = event.cache_hit
+                status.version = event.version
                 self.completed_packages.append(event.package_name)
                 self._update_display()