Merge pull request #4 from BeastByteAI/stdio_handler

spec 0.0.3, python v0.0.6

Author: OKUA1

spec/schemas/combined.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.0.2",
+    "version": "0.0.3",
     "manifest": {
         "$defs": {
             "JSON": {
@@ -500,6 +500,21 @@
                     },
                     "title": "Dependencies",
                     "type": "array"
+                },
+                "conda_channels": {
+                    "anyOf": [
+                        {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "default": null,
+                    "title": "Conda Channels"
                 }
             },
             "required": [

spec/schemas/src/generate.py

@@ -8,7 +8,7 @@
 from pydantic_models.meta import MetaEntry
 from pydantic_models.envs import Python3_CondaPip
 
-SPEC_VERSION = "0.0.2"
+SPEC_VERSION = "0.0.3"
 
 manifest_json_schema = Manifest.model_json_schema()
 ops_json_schema = OpInstances.model_json_schema()

spec/schemas/src/pydantic_models/envs.py

@@ -18,3 +18,4 @@ class Python3_CondaPip(BaseModel):
     python_version: str
     build_dependencies: list[str]
     dependencies: list[PipDependency]
+    conda_channels: list[str] | None = None

src/python/fnnx/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6"

src/python/fnnx/console.py

@@ -0,0 +1,69 @@
+from __future__ import annotations
+
+import shlex
+import shutil
+from contextlib import contextmanager
+
+
+class SimpleConsole:
+    def __init__(self):
+        self.is_tty = False
+        self.use_unicode = False
+
+    def icon(self, kind: str) -> str:
+        return {
+            "info": "i",
+            "ok": "+",
+            "warn": "!",
+            "err": "x",
+            "run": ">",
+            "spark": "*",
+        }.get(kind, "*")
+
+    def rule(self, title: str = "") -> None:
+        width = 80
+        try:
+            width = shutil.get_terminal_size((80, 20)).columns
+        except Exception:
+            pass
+        line = "-" * max(1, width)
+        if title:
+            print(line)
+            print(title)
+        print(line)
+
+    def info(self, msg: str) -> None:
+        print(f"{self.icon('info')} {msg}")
+
+    def success(self, msg: str) -> None:
+        print(f"{self.icon('ok')} {msg}")
+
+    def warn(self, msg: str) -> None:
+        print(f"{self.icon('warn')} {msg}")
+
+    def error(self, msg: str) -> None:
+        print(f"{self.icon('err')} {msg}")
+
+    def cmd(self, argv: list[str], label: str = "run") -> None:
+        try:
+            joined = shlex.join(argv)
+        except Exception:
+            joined = " ".join(argv)
+        print(f"{self.icon('run')} {label}: {joined}")
+
+    @contextmanager
+    def spinner(self, text: str, detail: str | None = None):
+        print(f"{self.icon('spark')} {text}" + (f" — {detail}" if detail else ""))
+        try:
+            yield
+        except Exception as e:
+            self.error(f"{text} failed: {e}")
+            raise
+        else:
+            self.success(f"{text} done")
+
+
+# TODO
+# class AnsiConsole()
+
+console = SimpleConsole()

src/python/fnnx/envs/_common.py

@@ -0,0 +1,50 @@
+import platform
+import subprocess
+import os
+
+def select_pip_deps(raw_deps: list[dict], accelerator: str) -> list[dict]:
+    sys_os = platform.system().lower()  # 'linux', 'darwin', 'windows'
+    machine = platform.machine().lower()  # 'x86_64', 'arm64', ...
+    accel = (accelerator or "cpu").lower()
+
+    out: list[dict] = []
+    for d in raw_deps:
+        cond = d.get("condition") or {}
+        ok = True
+        if cond.get("os"):
+            ok = ok and sys_os in [o.lower() for o in cond["os"]]
+        if cond.get("platform"):
+            ok = ok and any(p.lower() in machine for p in cond["platform"])
+        if cond.get("accelerator"):
+            ok = ok and accel in [a.lower() for a in cond["accelerator"]]
+        if ok:
+            out.append(
+                {"package": d["package"], "extra_pip_args": d.get("extra_pip_args")}
+            )
+    return out
+
+
+def run_cmd(
+    cmd: list[str], *, env: dict[str, str] | None = None, capture: bool = True
+) -> str:
+    if capture:
+        proc = subprocess.run(cmd, env=env, text=True, capture_output=True)
+        if proc.returncode != 0:
+            raise RuntimeError(
+                f"Command failed: {' '.join(cmd)}\n"
+                f"STDOUT:\n{proc.stdout}\n\nSTDERR:\n{proc.stderr}"
+            )
+        return proc.stdout
+    else:
+        proc = subprocess.run(cmd, env=env, text=True)
+        if proc.returncode != 0:
+            raise RuntimeError(f"Command failed: {' '.join(cmd)}")
+        return ""
+
+
+def which(exe: str):
+    for path in os.environ.get("PATH", "").split(os.pathsep):
+        cand = os.path.join(path, exe)
+        if os.path.isfile(cand) and os.access(cand, os.X_OK):
+            return cand
+    return None