uns-kit 0.0.7__py3-none-any.whl → 0.0.8__py3-none-any.whl

uns_kit/cli.py

@@ -128,6 +128,8 @@ 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)
@@ -136,11 +138,20 @@ def create(dest: str):
     if config_path.exists():
         try:
             data = json.loads(config_path.read_text())
-            project_name = Path(dest_path).name
-            data.setdefault("uns", {})["packageName"] = project_name
+            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}")
@@ -166,8 +177,6 @@ def write_config(path: str):
             "clean": True
         },
         "uns": {
-            "packageName": project_name,
-            "packageVersion": "0.0.1",
             "processName": "uns-process"
         }
     }

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/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.7.dist-info → uns_kit-0.0.8.dist-info}/METADATA

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

{uns_kit-0.0.7.dist-info → uns_kit-0.0.8.dist-info}/RECORD

@@ -1,13 +1,14 @@
 uns_kit/__init__.py,sha256=oLhYBOJkoYXBJGN7VDtJpMXAb1v5qFVphun5QgFwthw,564
-uns_kit/cli.py,sha256=b0iKl978Wn39q2HA-y-sMPDHYzdEJQ9TX5yit_-RVqw,6202
+uns_kit/cli.py,sha256=3yv6gnYoTJmGiT0Zgsuru8ylbtOcjtFTVFUGRBvWLjA,6546
 uns_kit/client.py,sha256=GjlGOTPuaxeLlgkfcJWpxMId6nLeZNsZTNBfOYAe8YY,14892
-uns_kit/config.py,sha256=K9FIvFB_zk59I_9XW5PA7sDRJOMl-5-3VCHbpyLgxyM,2899
+uns_kit/config.py,sha256=2pkQjH4m7WnqmitLrtaJM_EyQspXcgLg2jp-SfR46xQ,3621
 uns_kit/packet.py,sha256=M-JJ0--FVe-iFPGnBUFynx_0iKB9F3NFwvETJ7yKibc,5874
 uns_kit/proxy.py,sha256=H1Afs71rdb7DTHYp_8qeoM8uN5vOvAzYK50u9JszXQQ,2338
 uns_kit/proxy_process.py,sha256=If8HXd_YAf1xYjzy8BA73Jo0DRh0-3WpHHIoVcIbS-Q,3906
 uns_kit/status_monitor.py,sha256=8XXBaUHh8SW7gX4d3EtChnEkgQ7rnQ14tEHb0jDB25I,3022
 uns_kit/templates/default/README.md,sha256=5_o_xowRuzHtn3NzibO-Ysq6iTTAuYbvtTFn27dH-yU,1251
 uns_kit/templates/default/main.py,sha256=aD5o9FYl_5dBS-FQkB7kDXTMErmKQ360Qg9OdanJE0M,851
+uns_kit/templates/default/package.json,sha256=rhmHnWwUUFQq0ZEjTr1uEKv7lkDuQsdvOOKfiwrhkH0,144
 uns_kit/templates/default/pyproject.toml,sha256=KRPBGql4iVgBZIfdpOTNemPUdCBfvea3QHAb-tmh3jw,559
 uns_kit/templates/default/runtime.json,sha256=TqLe6z6z3T4yCu0XfFcAl1B1KCheEcQPi3s1kM0e4CA,54
 uns_kit/templates/default/src/data_example.py,sha256=8D1CyGVsbeKzZV79l8zaX-hqz_gxrA_ps2TA-GwzLQI,4381
@@ -16,7 +17,7 @@ uns_kit/templates/default/uns_py_app/__init__.py,sha256=3yOo4InP5WD5tN0Lu14mjd90
 uns_kit/topic_builder.py,sha256=UYC2SS9ptHopeyQ3ud1HEg1IHr5RJ7X2DEkfZC1CM5Y,1938
 uns_kit/uns_mqtt_proxy.py,sha256=QzG0E42r7n33Z4Ri70-DxTlVoM-wj0_wAtnbMyaet08,9831
 uns_kit/version.py,sha256=vmk-z_o25XOVgX5lSUrECllqau8NL7B_pkKsSmwhmX0,247
-uns_kit-0.0.7.dist-info/METADATA,sha256=dYpmPtq3sb1jytz4j485mgtn6WHY_qrOaUduLcK4xrg,3306
-uns_kit-0.0.7.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-uns_kit-0.0.7.dist-info/entry_points.txt,sha256=sLvTioiJQfGczUD-ODVx2xwwtHcGKjlIOn8t_Lt87Pg,47
-uns_kit-0.0.7.dist-info/RECORD,,
+uns_kit-0.0.8.dist-info/METADATA,sha256=kB3y6DwshDixLkCsoiD5L--cgFboYHvLk6KxwKoSGFc,3306
+uns_kit-0.0.8.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+uns_kit-0.0.8.dist-info/entry_points.txt,sha256=sLvTioiJQfGczUD-ODVx2xwwtHcGKjlIOn8t_Lt87Pg,47
+uns_kit-0.0.8.dist-info/RECORD,,