@hasna/models 0.0.6 → 0.0.7

package/dist/cli/index.js

@@ -3101,6 +3101,33 @@ import { mkdirSync as mkdirSync3 } from "fs";
 import { dirname as dirname4 } from "path";
 import { Database } from "bun:sqlite";
 var SCHEMA_VERSION = 1;
+function rowToInstall(row) {
+  return {
+    id: String(row.id),
+    provider: String(row.provider),
+    entityKind: String(row.entity_kind),
+    repoId: String(row.repo_id),
+    revision: String(row.revision),
+    installPath: String(row.install_path),
+    bytes: Number(row.bytes),
+    files: JSON.parse(String(row.files_json)),
+    status: String(row.status),
+    createdAt: String(row.created_at),
+    updatedAt: String(row.updated_at)
+  };
+}
+function parseInstallRef(input) {
+  try {
+    const trimmed = input.trim();
+    const ref = parseProviderRef(trimmed);
+    return {
+      ref,
+      hasExplicitRevision: trimmed.includes("@")
+    };
+  } catch {
+    return null;
+  }
+}
 
 class ModelsStore {
   db;
@@ -3264,25 +3291,21 @@ class ModelsStore {
   }
   listInstalls() {
     const rows = this.db.query("SELECT * FROM installs ORDER BY updated_at DESC").all();
-    return rows.map((row) => ({
-      id: String(row.id),
-      provider: String(row.provider),
-      entityKind: String(row.entity_kind),
-      repoId: String(row.repo_id),
-      revision: String(row.revision),
-      installPath: String(row.install_path),
-      bytes: Number(row.bytes),
-      files: JSON.parse(String(row.files_json)),
-      status: String(row.status),
-      createdAt: String(row.created_at),
-      updatedAt: String(row.updated_at)
-    }));
+    return rows.map(rowToInstall);
   }
   findInstall(repoIdOrId) {
     const row = this.db.query("SELECT * FROM installs WHERE id = ? OR repo_id = ? ORDER BY updated_at DESC LIMIT 1").get(repoIdOrId, repoIdOrId);
-    if (!row)
+    if (row)
+      return rowToInstall(row);
+    const parsed = parseInstallRef(repoIdOrId);
+    if (!parsed)
       return null;
-    return this.listInstalls().find((install) => install.id === row.id) ?? null;
+    const refRow = parsed.hasExplicitRevision ? this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ? AND revision = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId, parsed.ref.revision) : this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId);
+    return refRow ? rowToInstall(refRow) : null;
   }
   deleteInstall(id) {
     const result = this.db.prepare("DELETE FROM installs WHERE id = ?").run(id);

package/dist/index.js

@@ -23,8 +23,106 @@ function getInstallRoot() {
   return process.env["HASNA_MODELS_INSTALLS"] || join(getModelsHome(), "installs");
 }
 
+// src/ref.ts
+var ENTITY_KINDS = new Set(["model", "dataset", "space"]);
+var PROVIDER_ALIASES = new Map([
+  ["hf", "huggingface"],
+  ["huggingface", "huggingface"]
+]);
+function parseEntityKind(value) {
+  if (ENTITY_KINDS.has(value))
+    return value;
+  throw new Error(`Unsupported entity kind: ${value}. Expected one of: ${[...ENTITY_KINDS].join(", ")}`);
+}
+function parseProviderRef(input, defaultKind = "model") {
+  const trimmed = input.trim();
+  if (!trimmed)
+    throw new Error("model or dataset ref is required");
+  let provider = "huggingface";
+  let entityKind = parseEntityKind(defaultKind);
+  let rest = trimmed;
+  const prefixMatch = rest.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):(.*)$/);
+  if (prefixMatch && !prefixMatch[1].includes("/")) {
+    const alias = PROVIDER_ALIASES.get(prefixMatch[1]);
+    if (alias) {
+      provider = alias;
+      rest = prefixMatch[2];
+    } else if (["model", "dataset", "space"].includes(prefixMatch[1])) {
+      entityKind = parseEntityKind(prefixMatch[1]);
+      rest = prefixMatch[2];
+    } else {
+      throw new Error(`Unsupported provider: ${prefixMatch[1]}`);
+    }
+  }
+  if (rest.startsWith("model:")) {
+    entityKind = parseEntityKind("model");
+    rest = rest.slice("model:".length);
+  } else if (rest.startsWith("dataset:")) {
+    entityKind = parseEntityKind("dataset");
+    rest = rest.slice("dataset:".length);
+  } else if (rest.startsWith("space:")) {
+    entityKind = parseEntityKind("space");
+    rest = rest.slice("space:".length);
+  }
+  if (rest.includes(":")) {
+    throw new Error(`Unsupported ref prefix in: ${input}`);
+  }
+  let revision = "main";
+  const atIndex = rest.lastIndexOf("@");
+  if (atIndex > 0) {
+    revision = rest.slice(atIndex + 1);
+    rest = rest.slice(0, atIndex);
+    if (!revision.trim())
+      throw new Error(`Revision cannot be empty in ref: ${input}`);
+  } else if (rest.endsWith("@")) {
+    throw new Error(`Revision cannot be empty in ref: ${input}`);
+  }
+  if (!rest.includes("/")) {
+    throw new Error(`Expected a namespaced repo id such as owner/name, got ${input}`);
+  }
+  return { provider, entityKind, repoId: rest, revision };
+}
+function formatProviderRef(ref) {
+  const prefix = ref.provider === "huggingface" ? "hf" : ref.provider;
+  const kind = ref.entityKind === "model" ? "" : `${ref.entityKind}:`;
+  return `${prefix}:${kind}${ref.repoId}@${ref.revision}`;
+}
+function encodeRepoId(repoId) {
+  return repoId.split("/").map(encodeURIComponent).join("/");
+}
+function safePathSegment(value) {
+  return value.replace(/[^a-zA-Z0-9._-]+/g, "__").replace(/^_+|_+$/g, "") || "unnamed";
+}
+
 // src/storage.ts
 var SCHEMA_VERSION = 1;
+function rowToInstall(row) {
+  return {
+    id: String(row.id),
+    provider: String(row.provider),
+    entityKind: String(row.entity_kind),
+    repoId: String(row.repo_id),
+    revision: String(row.revision),
+    installPath: String(row.install_path),
+    bytes: Number(row.bytes),
+    files: JSON.parse(String(row.files_json)),
+    status: String(row.status),
+    createdAt: String(row.created_at),
+    updatedAt: String(row.updated_at)
+  };
+}
+function parseInstallRef(input) {
+  try {
+    const trimmed = input.trim();
+    const ref = parseProviderRef(trimmed);
+    return {
+      ref,
+      hasExplicitRevision: trimmed.includes("@")
+    };
+  } catch {
+    return null;
+  }
+}
 
 class ModelsStore {
   db;
@@ -188,25 +286,21 @@ class ModelsStore {
   }
   listInstalls() {
     const rows = this.db.query("SELECT * FROM installs ORDER BY updated_at DESC").all();
-    return rows.map((row) => ({
-      id: String(row.id),
-      provider: String(row.provider),
-      entityKind: String(row.entity_kind),
-      repoId: String(row.repo_id),
-      revision: String(row.revision),
-      installPath: String(row.install_path),
-      bytes: Number(row.bytes),
-      files: JSON.parse(String(row.files_json)),
-      status: String(row.status),
-      createdAt: String(row.created_at),
-      updatedAt: String(row.updated_at)
-    }));
+    return rows.map(rowToInstall);
   }
   findInstall(repoIdOrId) {
     const row = this.db.query("SELECT * FROM installs WHERE id = ? OR repo_id = ? ORDER BY updated_at DESC LIMIT 1").get(repoIdOrId, repoIdOrId);
-    if (!row)
+    if (row)
+      return rowToInstall(row);
+    const parsed = parseInstallRef(repoIdOrId);
+    if (!parsed)
       return null;
-    return this.listInstalls().find((install) => install.id === row.id) ?? null;
+    const refRow = parsed.hasExplicitRevision ? this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ? AND revision = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId, parsed.ref.revision) : this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId);
+    return refRow ? rowToInstall(refRow) : null;
   }
   deleteInstall(id) {
     const result = this.db.prepare("DELETE FROM installs WHERE id = ?").run(id);
@@ -249,76 +343,6 @@ class ModelsStore {
 function createStore(path) {
   return new ModelsStore(path);
 }
-// src/ref.ts
-var ENTITY_KINDS = new Set(["model", "dataset", "space"]);
-var PROVIDER_ALIASES = new Map([
-  ["hf", "huggingface"],
-  ["huggingface", "huggingface"]
-]);
-function parseEntityKind(value) {
-  if (ENTITY_KINDS.has(value))
-    return value;
-  throw new Error(`Unsupported entity kind: ${value}. Expected one of: ${[...ENTITY_KINDS].join(", ")}`);
-}
-function parseProviderRef(input, defaultKind = "model") {
-  const trimmed = input.trim();
-  if (!trimmed)
-    throw new Error("model or dataset ref is required");
-  let provider = "huggingface";
-  let entityKind = parseEntityKind(defaultKind);
-  let rest = trimmed;
-  const prefixMatch = rest.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):(.*)$/);
-  if (prefixMatch && !prefixMatch[1].includes("/")) {
-    const alias = PROVIDER_ALIASES.get(prefixMatch[1]);
-    if (alias) {
-      provider = alias;
-      rest = prefixMatch[2];
-    } else if (["model", "dataset", "space"].includes(prefixMatch[1])) {
-      entityKind = parseEntityKind(prefixMatch[1]);
-      rest = prefixMatch[2];
-    } else {
-      throw new Error(`Unsupported provider: ${prefixMatch[1]}`);
-    }
-  }
-  if (rest.startsWith("model:")) {
-    entityKind = parseEntityKind("model");
-    rest = rest.slice("model:".length);
-  } else if (rest.startsWith("dataset:")) {
-    entityKind = parseEntityKind("dataset");
-    rest = rest.slice("dataset:".length);
-  } else if (rest.startsWith("space:")) {
-    entityKind = parseEntityKind("space");
-    rest = rest.slice("space:".length);
-  }
-  if (rest.includes(":")) {
-    throw new Error(`Unsupported ref prefix in: ${input}`);
-  }
-  let revision = "main";
-  const atIndex = rest.lastIndexOf("@");
-  if (atIndex > 0) {
-    revision = rest.slice(atIndex + 1);
-    rest = rest.slice(0, atIndex);
-    if (!revision.trim())
-      throw new Error(`Revision cannot be empty in ref: ${input}`);
-  } else if (rest.endsWith("@")) {
-    throw new Error(`Revision cannot be empty in ref: ${input}`);
-  }
-  if (!rest.includes("/")) {
-    throw new Error(`Expected a namespaced repo id such as owner/name, got ${input}`);
-  }
-  return { provider, entityKind, repoId: rest, revision };
-}
-function formatProviderRef(ref) {
-  const prefix = ref.provider === "huggingface" ? "hf" : ref.provider;
-  const kind = ref.entityKind === "model" ? "" : `${ref.entityKind}:`;
-  return `${prefix}:${kind}${ref.repoId}@${ref.revision}`;
-}
-function encodeRepoId(repoId) {
-  return repoId.split("/").map(encodeURIComponent).join("/");
-}
-function safePathSegment(value) {
-  return value.replace(/[^a-zA-Z0-9._-]+/g, "__").replace(/^_+|_+$/g, "") || "unnamed";
-}
 // src/auth.ts
 import { mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "fs";
 import { dirname as dirname2 } from "path";

package/dist/storage.js

@@ -23,8 +23,106 @@ function getInstallRoot() {
   return process.env["HASNA_MODELS_INSTALLS"] || join(getModelsHome(), "installs");
 }
 
+// src/ref.ts
+var ENTITY_KINDS = new Set(["model", "dataset", "space"]);
+var PROVIDER_ALIASES = new Map([
+  ["hf", "huggingface"],
+  ["huggingface", "huggingface"]
+]);
+function parseEntityKind(value) {
+  if (ENTITY_KINDS.has(value))
+    return value;
+  throw new Error(`Unsupported entity kind: ${value}. Expected one of: ${[...ENTITY_KINDS].join(", ")}`);
+}
+function parseProviderRef(input, defaultKind = "model") {
+  const trimmed = input.trim();
+  if (!trimmed)
+    throw new Error("model or dataset ref is required");
+  let provider = "huggingface";
+  let entityKind = parseEntityKind(defaultKind);
+  let rest = trimmed;
+  const prefixMatch = rest.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):(.*)$/);
+  if (prefixMatch && !prefixMatch[1].includes("/")) {
+    const alias = PROVIDER_ALIASES.get(prefixMatch[1]);
+    if (alias) {
+      provider = alias;
+      rest = prefixMatch[2];
+    } else if (["model", "dataset", "space"].includes(prefixMatch[1])) {
+      entityKind = parseEntityKind(prefixMatch[1]);
+      rest = prefixMatch[2];
+    } else {
+      throw new Error(`Unsupported provider: ${prefixMatch[1]}`);
+    }
+  }
+  if (rest.startsWith("model:")) {
+    entityKind = parseEntityKind("model");
+    rest = rest.slice("model:".length);
+  } else if (rest.startsWith("dataset:")) {
+    entityKind = parseEntityKind("dataset");
+    rest = rest.slice("dataset:".length);
+  } else if (rest.startsWith("space:")) {
+    entityKind = parseEntityKind("space");
+    rest = rest.slice("space:".length);
+  }
+  if (rest.includes(":")) {
+    throw new Error(`Unsupported ref prefix in: ${input}`);
+  }
+  let revision = "main";
+  const atIndex = rest.lastIndexOf("@");
+  if (atIndex > 0) {
+    revision = rest.slice(atIndex + 1);
+    rest = rest.slice(0, atIndex);
+    if (!revision.trim())
+      throw new Error(`Revision cannot be empty in ref: ${input}`);
+  } else if (rest.endsWith("@")) {
+    throw new Error(`Revision cannot be empty in ref: ${input}`);
+  }
+  if (!rest.includes("/")) {
+    throw new Error(`Expected a namespaced repo id such as owner/name, got ${input}`);
+  }
+  return { provider, entityKind, repoId: rest, revision };
+}
+function formatProviderRef(ref) {
+  const prefix = ref.provider === "huggingface" ? "hf" : ref.provider;
+  const kind = ref.entityKind === "model" ? "" : `${ref.entityKind}:`;
+  return `${prefix}:${kind}${ref.repoId}@${ref.revision}`;
+}
+function encodeRepoId(repoId) {
+  return repoId.split("/").map(encodeURIComponent).join("/");
+}
+function safePathSegment(value) {
+  return value.replace(/[^a-zA-Z0-9._-]+/g, "__").replace(/^_+|_+$/g, "") || "unnamed";
+}
+
 // src/storage.ts
 var SCHEMA_VERSION = 1;
+function rowToInstall(row) {
+  return {
+    id: String(row.id),
+    provider: String(row.provider),
+    entityKind: String(row.entity_kind),
+    repoId: String(row.repo_id),
+    revision: String(row.revision),
+    installPath: String(row.install_path),
+    bytes: Number(row.bytes),
+    files: JSON.parse(String(row.files_json)),
+    status: String(row.status),
+    createdAt: String(row.created_at),
+    updatedAt: String(row.updated_at)
+  };
+}
+function parseInstallRef(input) {
+  try {
+    const trimmed = input.trim();
+    const ref = parseProviderRef(trimmed);
+    return {
+      ref,
+      hasExplicitRevision: trimmed.includes("@")
+    };
+  } catch {
+    return null;
+  }
+}
 
 class ModelsStore {
   db;
@@ -188,25 +286,21 @@ class ModelsStore {
   }
   listInstalls() {
     const rows = this.db.query("SELECT * FROM installs ORDER BY updated_at DESC").all();
-    return rows.map((row) => ({
-      id: String(row.id),
-      provider: String(row.provider),
-      entityKind: String(row.entity_kind),
-      repoId: String(row.repo_id),
-      revision: String(row.revision),
-      installPath: String(row.install_path),
-      bytes: Number(row.bytes),
-      files: JSON.parse(String(row.files_json)),
-      status: String(row.status),
-      createdAt: String(row.created_at),
-      updatedAt: String(row.updated_at)
-    }));
+    return rows.map(rowToInstall);
   }
   findInstall(repoIdOrId) {
     const row = this.db.query("SELECT * FROM installs WHERE id = ? OR repo_id = ? ORDER BY updated_at DESC LIMIT 1").get(repoIdOrId, repoIdOrId);
-    if (!row)
+    if (row)
+      return rowToInstall(row);
+    const parsed = parseInstallRef(repoIdOrId);
+    if (!parsed)
       return null;
-    return this.listInstalls().find((install) => install.id === row.id) ?? null;
+    const refRow = parsed.hasExplicitRevision ? this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ? AND revision = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId, parsed.ref.revision) : this.db.query(`SELECT * FROM installs
+         WHERE provider = ? AND entity_kind = ? AND repo_id = ?
+         ORDER BY updated_at DESC LIMIT 1`).get(parsed.ref.provider, parsed.ref.entityKind, parsed.ref.repoId);
+    return refRow ? rowToInstall(refRow) : null;
   }
   deleteInstall(id) {
     const result = this.db.prepare("DELETE FROM installs WHERE id = ?").run(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/models",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "CLI-first local model and dataset lifecycle tool for open-source/open-weight catalogs",
   "type": "module",
   "license": "Apache-2.0",