uns-kit 0.0.6__tar.gz → 0.0.8__tar.gz

{uns_kit-0.0.6 → uns_kit-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uns-kit
-Version: 0.0.6
+Version: 0.0.8
 Summary: Lightweight Python UNS MQTT client (pub/sub + infra topics)
 License: MIT
 Author: Aljoša Vister

{uns_kit-0.0.6 → uns_kit-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uns-kit"
-version = "0.0.6"
+version = "0.0.8"
 description = "Lightweight Python UNS MQTT client (pub/sub + infra topics)"
 authors = ["Aljoša Vister <aljosa.vister@gmail.com>"]
 license = "MIT"

{uns_kit-0.0.6 → uns_kit-0.0.8}/src/uns_kit/cli.py

@@ -128,9 +128,30 @@ async def _run_subscribe(
 def create(dest: str):
     template_root = importlib.resources.files("uns_kit").joinpath("templates/default")
     dest_path = os.path.abspath(dest)
+    project_name = Path(dest_path).name
+    package_version = "0.0.0"
     if os.path.exists(dest_path):
         raise click.ClickException(f"Destination already exists: {dest_path}")
     shutil.copytree(template_root, dest_path)
+    # personalize config with project name
+    config_path = Path(dest_path) / "config.json"
+    if config_path.exists():
+        try:
+            data = json.loads(config_path.read_text())
+            data.setdefault("uns", {})  # keep structure for processName, etc.
+            config_path.write_text(json.dumps(data, indent=2))
+        except Exception:
+            pass
+    # personalize package.json for PM2 metadata
+    pkg_path = Path(dest_path) / "package.json"
+    if pkg_path.exists():
+        try:
+            pkg_data = json.loads(pkg_path.read_text())
+            pkg_data["name"] = project_name
+            pkg_data["version"] = package_version
+            pkg_path.write_text(json.dumps(pkg_data, indent=2))
+        except Exception:
+            pass
     click.echo(f"Created UNS Python app at {dest_path}")
     click.echo("Next steps:")
     click.echo(f"  1) cd {dest_path}")
@@ -142,6 +163,7 @@ def create(dest: str):
 @cli.command("write-config", help="Write a minimal config.json scaffold.")
 @click.option("--path", default="config.json", show_default=True)
 def write_config(path: str):
+    project_name = Path(path).resolve().parent.name
     data = {
         "infra": {
             "host": "localhost",
@@ -155,8 +177,6 @@ def write_config(path: str):
             "clean": True
         },
         "uns": {
-            "packageName": "uns-kit",
-            "packageVersion": "0.0.1",
             "processName": "uns-process"
         }
     }

{uns_kit-0.0.6 → uns_kit-0.0.8}/src/uns_kit/config.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 from .topic_builder import TopicBuilder
 from .version import __version__
@@ -34,6 +34,7 @@ class UnsConfig:
 
         infra = data.get("infra", {}) or {}
         uns_section = data.get("uns", {}) or {}
+        pkg_name, pkg_version = _read_package_metadata(path)
 
         proto = (infra.get("protocol") or "").lower()
         tls = proto in ("mqtts", "ssl", "wss")
@@ -52,8 +53,8 @@ class UnsConfig:
             mqtt_sub_to_topics=infra.get("mqttSubToTopics"),
             keepalive=infra.get("keepalive", 60),
             clean_session=infra.get("clean", True),
-            package_name=uns_section.get("packageName", "uns-kit"),
-            package_version=uns_section.get("packageVersion") or __version__,
+            package_name=uns_section.get("packageName") or pkg_name or "uns-kit",
+            package_version=uns_section.get("packageVersion") or pkg_version or __version__,
             process_name=uns_section.get("processName", "uns-process"),
         )
 
@@ -88,3 +89,20 @@ class UnsConfig:
 
 def _none_if_empty(value: Optional[str]) -> Optional[str]:
     return None if value == "" else value
+
+
+def _read_package_metadata(config_path: Path) -> Tuple[Optional[str], Optional[str]]:
+    """
+    Read name/version from the nearest package.json beside the config (if present).
+    Falls back to None when not available or invalid.
+    """
+    pkg_path = config_path.parent / "package.json"
+    if not pkg_path.exists():
+        return None, None
+    try:
+        pkg = json.loads(pkg_path.read_text())
+        name = pkg.get("name")
+        version = pkg.get("version")
+        return (name if isinstance(name, str) else None, version if isinstance(version, str) else None)
+    except Exception:
+        return None, None

uns_kit-0.0.8/src/uns_kit/templates/default/main.py

@@ -0,0 +1,34 @@
+import asyncio
+import json
+from pathlib import Path
+
+from uns_kit import UnsMqttClient, UnsPacket, TopicBuilder, UnsConfig
+
+
+async def run():
+    # Load TS-style nested config
+    cfg = UnsConfig.load(Path("config.json"))
+    tb = cfg.topic_builder()
+
+    client = UnsMqttClient(
+        cfg.host,
+        port=cfg.port,
+        username=cfg.username,
+        password=cfg.password,
+        tls=cfg.tls,
+        client_id=cfg.client_id or f"{cfg.process_name}-py",
+        topic_builder=tb,
+        reconnect_interval=1,
+    )
+    await client.connect()
+
+    # Publish a startup heartbeat to raw/data/ (can be changed)
+    await client.publish_packet("raw/data/", UnsPacket.data(value="started", uom="state"))
+
+    # Idle loop; adjust to your workload
+    while True:
+        await asyncio.sleep(5)
+
+
+if __name__ == "__main__":
+    asyncio.run(run())

uns_kit-0.0.8/src/uns_kit/templates/default/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "__APP_NAME__",
+  "version": "__APP_VERSION__",
+  "private": true,
+  "description": "UNS Python application generated by uns-kit"
+}

{uns_kit-0.0.6 → uns_kit-0.0.8}/src/uns_kit/templates/default/pyproject.toml

@@ -3,7 +3,7 @@ name = "uns-py-app"
 version = "0.1.0"
 description = "Example UNS Python application"
 authors = ["Your Name <you@example.com>"]
-package-mode = false
+packages = [{ include = "uns_py_app" }]
 
 [tool.poetry.dependencies]
 python = "^3.10"

uns_kit-0.0.8/src/uns_kit/templates/default/runtime.json

@@ -0,0 +1,4 @@
+{
+  "runtime": "python",
+  "entry": "../../main.py"
+}

uns_kit-0.0.8/src/uns_kit/templates/default/uns_py_app/__init__.py

@@ -0,0 +1 @@
+# Placeholder package so Poetry can build a wheel.