abstract-hugpy 0.1.331__tar.gz → 0.1.332__tar.gz

{abstract_hugpy-0.1.331 → abstract_hugpy-0.1.332}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_hugpy
-Version: 0.1.331
+Version: 0.1.332
 Summary: The `abstract_hugpy` module is designed to facilitate hugging face modules
 Home-page: https://github.com/AbstractEndeavors/abstract_hugpy
 Author: putkoff

{abstract_hugpy-0.1.331 → abstract_hugpy-0.1.332}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 setuptools.setup(
     name='abstract_hugpy',
-    version='0.1.331',
+    version='0.1.332',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description='The `abstract_hugpy` module is designed to facilitate hugging face modules',

{abstract_hugpy-0.1.331 → abstract_hugpy-0.1.332}/src/abstract_hugpy/imports/apis/download_models.py

@@ -38,25 +38,20 @@ def runtime_folder(framework: str, hub_id: str, include: Any = None, filename: s
     return "misc"
 
 
-def destination_for_model(
-    *,
-    hub_id: str,
-    framework: str,
-    primary_task: str,
-    include: Any = None,
-    filename: str | None = None,
-    repo_type: str = "model",
-    **kwargs
-) -> str:
-    hub_path = safe_path_part(hub_id)
-    task_path = safe_path_part(primary_task or "misc")
-
-    if repo_type == "dataset" or primary_task == "dataset":
-        return os.path.join(DATASETS_DIR,hub_path)
-
-    runtime = runtime_folder(framework, hub_id, include=include, filename=filename)
-    return os.path.join(MODELS_DIR,runtime,task_path,hub_path)
+def route_destination(root: str = DEFAULT_ROOT, model: dict = None) -> str:
+    model = model or {}
+    hub_id    = model.get("hub_id") or model.get("name") or model.get("folder") or ""
+    framework = (model.get("framework") or "").strip()
+    task      = resolve_task(model)
+    hub_path  = safe_path_part(hub_id)
+
+    if task == "dataset":
+        return os.path.join(root, "datasets", hub_path)
 
+    runtime = runtime_folder(framework, hub_id,
+                             include=model.get("include"),
+                             filename=model.get("filename"))
+    return os.path.join(root, "models", runtime, safe_path_part(task), hub_path)
 
 def _clean_repo_id(hub_id: str) -> str:
     """Strip storage-path routing (family/task/...) back to owner/repo.
@@ -91,33 +86,7 @@ def split_hub_id(hub_id: str) -> tuple[str, str | None]:
     return repo_id, subfolder
 
 
-def route_destination(root: str, model: dict) -> str:
-    """Where a model lands: root/<runtime>/<task>/<hub_path>, or root/datasets/<hub_path>.
-
-    Delegates the runtime-folder decision (gguf vs transformers vs misc) to
-    storage_router.runtime_folder — the single source of truth — instead of
-    re-deciding it inline. runtime_folder catches GGUF by framework AND by
-    filename AND by include-pattern, so a transformers-tagged repo pointing at
-    a .gguf still lands in gguf/ correctly.
 
-    NOTE: this is NOT the HF cache layout (models--org--repo/snapshots/hash).
-    That layout is for symlink-based caching; we use local_dir flat trees so the
-    registry is human-browsable. The taxonomy (framework/task) is ours by design.
-    """
-    hub_id   = model.get("hub_id") or model.get("name") or model.get("folder") or ""
-    framework = (model.get("framework") or "").strip()
-    task      = model.get("primary_task") or model.get("task") or "misc"
-    include   = model.get("include")
-    filename  = model.get("filename")
-
-    return destination_for_model(
-        hub_id=hub_id,
-        framework=framework,
-        task=task,
-        include=include,
-        filename=filename,
-        repo_type="dataset" if task == "dataset" else "model",
-    )
 
 
 def _stamp(destination: str, key: str, model: dict[str, Any]) -> None:

{abstract_hugpy-0.1.331 → abstract_hugpy-0.1.332}/src/abstract_hugpy/imports/src/utils.py

@@ -319,3 +319,30 @@ def merge_disk_over_registry(
 
 def make_request_id() -> str:
     return f"req-{uuid.uuid4().hex[:12]}"
+
+def resolve_task(model: dict) -> str:
+    """Effective task across all dict shapes:
+       ModelConfig.to_dict() -> primary_task (+ tasks list)
+       /repos/download dict   -> primary_task
+       legacy manifest        -> task (singular)
+    First non-empty wins; misc is the floor."""
+    pt = model.get("primary_task")
+    if pt:
+        return pt
+    tasks = model.get("tasks")
+    if tasks:
+        return tasks[0] if isinstance(tasks, list) else tasks
+    return model.get("task") or "misc"
+
+def route_destination(root: str, model: dict) -> str:
+    hub_id    = model.get("hub_id") or model.get("name") or model.get("folder") or ""
+    framework = (model.get("framework") or "").strip()
+    task      = resolve_task(model)
+    return destination_for_model(
+        hub_id=hub_id,
+        framework=framework,
+        primary_task=task,
+        include=model.get("include"),
+        filename=model.get("filename"),
+        repo_type="dataset" if task == "dataset" else "model",
+    )

{abstract_hugpy-0.1.331 → abstract_hugpy-0.1.332}/src/abstract_hugpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_hugpy
-Version: 0.1.331
+Version: 0.1.332
 Summary: The `abstract_hugpy` module is designed to facilitate hugging face modules
 Home-page: https://github.com/AbstractEndeavors/abstract_hugpy
 Author: putkoff