Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.
Python calibrationclassificationdecision-modelhuggingfacejevmodernbertmultilingualnlppythonpytorchroutingtyped-decisionszero-shot
feat: bundle all three checkpoints in one repo, subfolder loading (v0.3.0)
Nandakishoredef8bbc20bd
diff --git a/laya/__init__.py b/laya/__init__.pyindex e94d1710..e2d73141 100644--- a/laya/__init__.py+++ b/laya/__init__.py@@ -22,7 +22,7 @@ from .presets import ()from .router import DEFAULT_MODELS, RouteDecision, Router-__version__ = "0.2.1"+__version__ = "0.3.0"__all__ = ["Agent","RLAgent",diff --git a/laya/agent.py b/laya/agent.pyindex ff81c8ea..ada32dde 100644--- a/laya/agent.py+++ b/laya/agent.py@@ -101,7 +101,14 @@ class Agent:model_id_or_path: str = "convaiinnovations/laya",device: Optional[str] = None,token: Optional[str] = None,+ subfolder: Optional[str] = None,):+ """Load a Laya checkpoint.++ `subfolder` selects one checkpoint from a repo that bundles several, e.g.+ `Agent("convaiinnovations/laya", subfolder="multilingual")`. Only that subfolder is+ downloaded, so bundling does not cost every user the whole family.+ """from safetensors.torch import load_filefrom transformers import AutoTokenizer@@ -114,7 +121,18 @@ class Agent:)from huggingface_hub import snapshot_download- model_dir = snapshot_download(model_id_or_path, token=token or os.environ.get("HF_TOKEN"))+ kw = {"token": token or os.environ.get("HF_TOKEN")}+ if subfolder:+ # fetch only the requested checkpoint, not every checkpoint in the repo+ kw["allow_patterns"] = [f"{subfolder}/*"]+ model_dir = snapshot_download(model_id_or_path, **kw)++ if subfolder:+ model_dir = os.path.join(model_dir, subfolder)+ if not os.path.isdir(model_dir):+ raise FileNotFoundError(+ f"Subfolder {subfolder!r} not found in {model_id_or_path!r}."+ )_fix_tokenizer_config(model_dir)@@ -316,6 +334,13 @@ class Agent:RLAgent = Agent-def load(model_id_or_path: str = "convaiinnovations/laya", device: Optional[str] = None, token: Optional[str] = None) -> Agent:- """Helper function to load a Laya agent model."""- return Agent(model_id_or_path, device=device, token=token)+def load(model_id_or_path: str = "convaiinnovations/laya", device: Optional[str] = None,+ token: Optional[str] = None, subfolder: Optional[str] = None) -> Agent:+ """Load a Laya agent.++ `subfolder` picks one checkpoint out of a repo that bundles several:++ laya.load("convaiinnovations/laya") # English (repo root)+ laya.load("convaiinnovations/laya", subfolder="multilingual")+ """+ return Agent(model_id_or_path, device=device, token=token, subfolder=subfolder)diff --git a/laya/router.py b/laya/router.pyindex 4f0c1680..8daea309 100644--- a/laya/router.py+++ b/laya/router.py@@ -32,12 +32,35 @@ from typing import Any, Dict, List, Optional, Unionfrom .lang import analyse+# The hub repo bundles all three checkpoints; only the requested subfolder is downloaded.+BUNDLE_REPO = "convaiinnovations/laya"DEFAULT_MODELS = {+ "english": (BUNDLE_REPO, None),+ "multilingual": (BUNDLE_REPO, "multilingual"),+ "typed-decisions": (BUNDLE_REPO, "typed-decisions"),+}++# The same checkpoints also live in their own repos, for anyone who prefers them.+STANDALONE_MODELS = {"english": "convaiinnovations/laya","multilingual": "convaiinnovations/laya-multilingual","typed-decisions": "convaiinnovations/laya-typed-decisions",}++def _repo_str(spec):+ """Human-readable id for a model spec: 'repo' or 'repo/subfolder'."""+ repo, sub = _split(spec)+ return "%s/%s" % (repo, sub) if sub else repo+++def _split(spec):+ """Normalise a model spec to (repo_or_path, subfolder)."""+ if isinstance(spec, (tuple, list)):+ repo, sub = (list(spec) + [None])[:2]+ return repo, sub+ return spec, None+# Aliases people are likely to type._ALIASES = {"en": "english", "laya": "english", "default": "english",@@ -118,8 +141,9 @@ class Router:max_loaded: int = 1,default: str = "english",auto_task_detection: bool = False,+ standalone_repos: bool = False,):- self.models = dict(DEFAULT_MODELS)+ self.models = dict(STANDALONE_MODELS if standalone_repos else DEFAULT_MODELS)if models:self.models.update({normalise_name(k): v for k, v in models.items()})self.device = device@@ -138,7 +162,8 @@ class Router:self._touch(key)return self._agents[key]from .agent import Agent- agent = Agent(self.models[key], device=self.device, token=self.token)+ repo, sub = _split(self.models[key])+ agent = Agent(repo, device=self.device, token=self.token, subfolder=sub)self._agents[key] = agentself._order.append(key)self._evict()@@ -189,12 +214,12 @@ class Router:"""if model is not None:key = normalise_name(model)- return RouteDecision(model=key, repo=self.models[key], reason="explicit model=%r" % model,+ return RouteDecision(model=key, repo=_repo_str(self.models[key]), reason="explicit model=%r" % model,detection=None, workflow=None)if task is not None:key = normalise_name("typed-decisions" if str(task).lower().replace("-", "_") == "typed_decisions" else task)- return RouteDecision(model=key, repo=self.models[key], reason="explicit task=%r" % task,+ return RouteDecision(model=key, repo=_repo_str(self.models[key]), reason="explicit task=%r" % task,detection=None, workflow=None)workflow = match_typed_decisions_workflow(questions or {})@@ -205,7 +230,7 @@ class Router:if lang is not None:key = "english" if str(lang).lower().split("-")[0] in ("en", "eng", "english") else "multilingual"- return RouteDecision(model=key, repo=self.models[key], reason="explicit lang=%r" % lang,+ return RouteDecision(model=key, repo=_repo_str(self.models[key]), reason="explicit lang=%r" % lang,detection=None, workflow=workflow)det = analyse(state)@@ -222,7 +247,7 @@ class Router:else:key = "english"reason = "English Latin text"- return RouteDecision(model=key, repo=self.models[key], reason=reason,+ return RouteDecision(model=key, repo=_repo_str(self.models[key]), reason=reason,detection=det, workflow=workflow)# ------------------------------------------------------------------ runningdiff --git a/pyproject.toml b/pyproject.tomlindex 51c57737..065b36c0 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"[project]name = "laya"-version = "0.2.1"+version = "0.3.0"description = "Fast, non-autoregressive System 1 decision engine with calibrated probabilities"readme = "README.md"requires-python = ">=3.8"diff --git a/setup.py b/setup.pyindex 80dc2b6e..dfd246a6 100644--- a/setup.py+++ b/setup.py@@ -2,7 +2,7 @@ from setuptools import setup, find_packagessetup(name="laya",- version="0.2.1",+ version="0.3.0",description="Fast, non-autoregressive System 1 decision engine with calibrated probabilities",long_description=open("README.md").read(),long_description_content_type="text/markdown",diff --git a/tests/test_router.py b/tests/test_router.pyindex 388c9cb4..3cf78964 100644--- a/tests/test_router.py+++ b/tests/test_router.py@@ -6,7 +6,10 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))from laya.lang import analyse, detect_script, guess_latin_language, is_english, state_text # noqa: E402from laya.router import ( # noqa: E402+ BUNDLE_REPO,DEFAULT_MODELS,+ STANDALONE_MODELS,+ _repo_str,Router,match_typed_decisions_workflow,normalise_name,@@ -149,7 +152,7 @@ check("route/explicit beats workflow",# decision payload shaped = r.route({"body": "मुझसे दो बार शुल्क लिया गया"}, Q_GENERIC)-check("decision/has repo", d["repo"], DEFAULT_MODELS["multilingual"])+check("decision/has repo", d["repo"], "convaiinnovations/laya/multilingual")check("decision/has reason", isinstance(d["reason"], str) and len(d["reason"]) > 0, True)check("decision/detection script", d["detection"]["script"], "devanagari")check("decision/.model property", d.model, "multilingual")@@ -206,6 +209,28 @@ rr.unload()check("lru/unload all", rr.loaded, [])+# --------------------------------------------------------------------- bundle vs standalone+check("bundle/english is repo root", DEFAULT_MODELS["english"], (BUNDLE_REPO, None))+check("bundle/multilingual subfolder", DEFAULT_MODELS["multilingual"], (BUNDLE_REPO, "multilingual"))+check("bundle/typed subfolder", DEFAULT_MODELS["typed-decisions"], (BUNDLE_REPO, "typed-decisions"))+check("repo_str/root", _repo_str((BUNDLE_REPO, None)), "convaiinnovations/laya")+check("repo_str/sub", _repo_str((BUNDLE_REPO, "multilingual")), "convaiinnovations/laya/multilingual")+check("repo_str/plain string", _repo_str("some/repo"), "some/repo")++r_bundle = Router()+r_alone = Router(standalone_repos=True)+check("bundle/default router uses bundle",+ r_bundle.route({"m": "मुझसे दो बार"}, Q_GENERIC)["repo"], "convaiinnovations/laya/multilingual")+check("standalone/opt-in uses own repo",+ r_alone.route({"m": "मुझसे दो बार"}, Q_GENERIC)["repo"], "convaiinnovations/laya-multilingual")+check("standalone/english unchanged",+ r_alone.route({"m": "I was charged twice"}, Q_GENERIC)["repo"], "convaiinnovations/laya")+check("standalone map complete", sorted(STANDALONE_MODELS), sorted(DEFAULT_MODELS))+# a local-path override must still work (the Space and tests rely on it)+r_local = Router(models={"english": "/tmp/en", "multilingual": "/tmp/ml"})+check("override/local path kept", r_local.route({"m": "मुझसे दो बार"}, Q_GENERIC)["repo"], "/tmp/ml")++# --------------------------------------------------------------------- reportprint("\n%d passed, %d failed" % (len(PASS), len(FAIL)))for f in FAIL: