unitysvc-data 0.1.3__tar.gz → 0.1.5__tar.gz

{unitysvc_data-0.1.3/src/unitysvc_data.egg-info → unitysvc_data-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-data
-Version: 0.1.3
+Version: 0.1.5
 Summary: Standard examples and presets for UnitySVC data packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-data"
-version = "0.1.3"
+version = "0.1.5"
 description = "Standard examples and presets for UnitySVC data packages"
 readme = "README.md"
 authors = [{ name = "Bo Peng", email = "bo.peng@unitysvc.com" }]

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/src/unitysvc_data/__init__.py

@@ -90,6 +90,11 @@ def list_examples() -> list[str]:
 
 # Imported last so presets.py can compute its own _EXAMPLES_ROOT without
 # reaching back into this module while __init__ is still loading.
+# The ``from .presets import ...`` line also runs the ``@preset``
+# decorators that populate :data:`PRESET_FNS` — so downstream consumers
+# (notably ``unitysvc_core.load_data_file``) can enumerate every
+# decorated preset without knowing their names ahead of time.
+from ._registry import PRESET_FNS, preset  # noqa: E402  (placement is deliberate)
 from .presets import (  # noqa: E402  (placement is deliberate)
     ALIASES,
     MANIFEST,
@@ -112,6 +117,10 @@ __all__ = [
     "MANIFEST",
     "OVERRIDABLE",
     "register_jinja_globals",
+    # Decorator-driven registry — downstream tools enumerate these to
+    # discover every preset type without hard-coding function names.
+    "preset",
+    "PRESET_FNS",
     # Low-level path-based API.
     "example_path",
     "read_example",

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/src/unitysvc_data/_manifest.json

@@ -5,7 +5,7 @@
     "s3_code_example": "s3_code_example_v1",
     "s3_connectivity": "s3_connectivity_v1",
     "s3_description": "s3_description_v1",
-    "smtp_connectivity": "smtp_connectivity_v1"
+    "smtp_connectivity": "smtp_connectivity_v2"
   },
   "presets": {
     "api_connectivity_v1": {
@@ -93,6 +93,20 @@
       "preset_name": "smtp_connectivity",
       "source_readme": "smtp/connectivity/README.md",
       "version": 1
+    },
+    "smtp_connectivity_v2": {
+      "category": "connectivity_test",
+      "description": "Verify SMTP server returns a 220 greeting on connect",
+      "example_file": "smtp/connectivity/connectivity-v2.sh.j2",
+      "is_active": true,
+      "is_public": false,
+      "meta": {
+        "output_contains": "connectivity ok"
+      },
+      "mime_type": "bash",
+      "preset_name": "smtp_connectivity",
+      "source_readme": "smtp/connectivity/README.md",
+      "version": 2
     }
   },
   "version": "1"

unitysvc_data-0.1.5/src/unitysvc_data/_registry.py

@@ -0,0 +1,67 @@
+"""Decorator-driven registry for preset sentinel callables.
+
+Any function decorated with :func:`preset` is registered under its
+``__name__`` in :data:`PRESET_FNS`, where downstream consumers
+(notably ``unitysvc-core``'s ``load_data_file``) discover them. Adding
+a new preset type — for example a ``schema_preset`` or
+``policy_preset`` — is then purely a matter of decorating the
+function and releasing a new ``unitysvc-data``; every consumer picks
+it up automatically on the next install.
+
+The decorator wraps each function with the **sentinel calling
+convention**: the value in a ``{"$<name>": value}`` sentinel is
+passed to the wrapped function, with the seller-facing flat form
+
+    {"name": "<preset>", "<override>": ...}
+
+transparently unpacked into ``fn(name, **overrides)``. Any other
+shape (bare string, the internal ``{"$preset": ..., "$with": {...}}``
+form that ``doc_preset`` understands, etc.) is forwarded verbatim.
+
+The original (undecorated) function is returned unchanged so callers
+can keep using it programmatically:
+
+    >>> from unitysvc_data import doc_preset
+    >>> doc_preset("s3_connectivity", is_public=False)
+    {...}
+
+The registry lookup uses the wrapped, sentinel-aware version.
+"""
+
+from __future__ import annotations
+
+import functools
+from collections.abc import Callable
+from typing import Any
+
+#: Registered preset callables keyed by sentinel name (without the
+#: leading ``$``). Populated by :func:`preset` at import time.
+PRESET_FNS: dict[str, Callable[[Any], Any]] = {}
+
+
+def preset(fn: Callable[..., Any]) -> Callable[..., Any]:
+    """Register *fn* in :data:`PRESET_FNS` under its ``__name__``.
+
+    The registered entry is a thin wrapper that unpacks the
+    seller-facing flat sentinel form before delegating::
+
+        {"name": "<preset>", "<override>": ...}   ->   fn("<preset>", **overrides)
+
+    Any other value (bare string, dict without a string ``name`` key,
+    etc.) is forwarded to ``fn`` unchanged — the underlying function
+    is responsible for validating its own input.
+
+    Returns the undecorated function so programmatic callers keep the
+    original signature.
+    """
+
+    @functools.wraps(fn)
+    def _sentinel_entrypoint(source: Any) -> Any:
+        if isinstance(source, dict) and isinstance(source.get("name"), str):
+            name = source["name"]
+            overrides = {k: v for k, v in source.items() if k != "name"}
+            return fn(name, **overrides)
+        return fn(source)
+
+    PRESET_FNS[fn.__name__] = _sentinel_entrypoint
+    return fn

unitysvc_data-0.1.5/src/unitysvc_data/_version.py

@@ -0,0 +1,17 @@
+"""Single source of truth for the package version.
+
+The canonical version lives in ``pyproject.toml``'s ``[project]`` table
+— that's what PyPI, ``pip install``, and ``pip show`` read. This
+module asks ``importlib.metadata`` for the installed distribution's
+version so downstream code can ``from unitysvc_data import __version__``
+without the two values ever drifting apart.
+"""
+
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("unitysvc-data")
+except PackageNotFoundError:  # pragma: no cover
+    # Running from a checkout that hasn't been ``pip install``-ed.
+    __version__ = "0.0.0+unknown"
+

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/src/unitysvc_data/examples/smtp/connectivity/README.md

@@ -45,6 +45,18 @@ The script picks the mode by looking at which env var is set — no
 
 ## Versions
 
+### v2 — TLS support
+
+- Reads `$TLS` env var (local mode) and detects `smtps://` scheme (online
+  mode) to select the transport.
+- When TLS is required, uses `openssl s_client -connect` instead of `nc`
+  so that implicit-TLS (SMTPS) upstreams complete the handshake before
+  the server sends the `220` banner.
+- When TLS is not required, behaviour is identical to v1.
+- Use v2 for any upstream with `tls: true` in `upstream_access_config`
+  or a `smtps://` gateway URL.
+
 ### v1 — initial release
 
 - Uses `nc -w 5`; sends `QUIT`; accepts any `220 ...` banner.
+- Plain SMTP only — does not handle implicit TLS (SMTPS).

unitysvc_data-0.1.5/src/unitysvc_data/examples/smtp/connectivity/connectivity-v2.sh.j2

@@ -0,0 +1,45 @@
+#!/bin/bash
+# Connectivity test for SMTP services. A healthy mail server sends a
+# "220 ... ESMTP ..." greeting on connect; anything else (no response,
+# timeout, or other greeting code) is treated as failure.
+#
+# Env var layout the harness provides:
+#   local mode   — $HOST, $PORT, $TLS  (from upstream_access_config)
+#   online mode  — $SERVICE_BASE_URL   (smtp://host:port or smtps://host:port)
+# We branch on whichever is present so the same script works in both.
+set -o pipefail
+
+USE_TLS=false
+
+if [ -n "${HOST:-}" ]; then
+    PORT="${PORT:-587}"
+    [ "${TLS:-False}" = "True" ] && USE_TLS=true
+else
+    URL="${SERVICE_BASE_URL:?need HOST or SERVICE_BASE_URL}"
+    if [[ "$URL" == smtps://* ]]; then
+        USE_TLS=true
+        stripped="${URL#smtps://}"
+    else
+        stripped="${URL#smtp://}"
+    fi
+    HOST="${stripped%%:*}"
+    PORT="${stripped#*:}"
+    PORT="${PORT%%/*}"
+    PORT="${PORT:-587}"
+fi
+
+# Send QUIT so the server closes cleanly instead of timing out on us.
+# Use openssl s_client for implicit TLS (SMTPS); nc for plain SMTP.
+if [ "$USE_TLS" = "true" ]; then
+    greeting=$( (echo "QUIT"; sleep 1) | openssl s_client -connect "$HOST:$PORT" -quiet 2>/dev/null | head -1 )
+else
+    greeting=$( (echo "QUIT"; sleep 1) | nc -w 5 "$HOST" "$PORT" 2>/dev/null | head -1 )
+fi
+
+if [[ "$greeting" == "220 "* ]]; then
+    echo "connectivity ok ($greeting)"
+    exit 0
+fi
+
+echo "connectivity failed: expected '220 ...' greeting from ${HOST}:${PORT}, got: ${greeting:-<no response>}" >&2
+exit 1

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/src/unitysvc_data/presets.py

@@ -36,6 +36,8 @@ from importlib.resources import files as _files
 from pathlib import Path
 from typing import Any
 
+from ._registry import preset
+
 # Resolved once at import time. Duplicated with __init__ rather than
 # imported to avoid a circular import during package load. Use
 # ``__package__`` (the parent package, "unitysvc_data") rather than
@@ -177,6 +179,7 @@ def _lookup(name: str, pool: dict[str, Any], what: str) -> Any:
 # --- Public API ------------------------------------------------------------
 
 
+@preset
 def doc_preset(source: Any, **overrides: Any) -> dict[str, Any]:
     """Return a fully-populated document record for the named preset.
 
@@ -205,6 +208,7 @@ def doc_preset(source: Any, **overrides: Any) -> dict[str, Any]:
     return factory(**(sentinel_overrides or overrides))
 
 
+@preset
 def file_preset(source: Any) -> str:
     """Return the raw UTF-8 content of the preset's bundled file.
 

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5/src/unitysvc_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-data
-Version: 0.1.3
+Version: 0.1.5
 Summary: Standard examples and presets for UnitySVC data packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/src/unitysvc_data.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 src/unitysvc_data/__init__.py
 src/unitysvc_data/_manifest.json
+src/unitysvc_data/_registry.py
 src/unitysvc_data/_version.py
 src/unitysvc_data/cli.py
 src/unitysvc_data/presets.py
@@ -25,6 +26,7 @@ src/unitysvc_data/examples/s3/description/README.md
 src/unitysvc_data/examples/s3/description/description-v1.md
 src/unitysvc_data/examples/smtp/connectivity/README.md
 src/unitysvc_data/examples/smtp/connectivity/connectivity-v1.sh.j2
+src/unitysvc_data/examples/smtp/connectivity/connectivity-v2.sh.j2
 tests/test_build.py
 tests/test_cli.py
 tests/test_presets.py

{unitysvc_data-0.1.3 → unitysvc_data-0.1.5}/tests/test_presets.py

@@ -308,3 +308,83 @@ def test_manifest_is_up_to_date():
         f"stdout:\n{result.stdout}\n"
         f"stderr:\n{result.stderr}"
     )
+
+
+# ---------------------------------------------------------------------------
+# @preset decorator + PRESET_FNS registry
+# ---------------------------------------------------------------------------
+
+
+def test_preset_fns_registry_contains_doc_and_file():
+    from unitysvc_data import PRESET_FNS
+
+    assert "doc_preset" in PRESET_FNS
+    assert "file_preset" in PRESET_FNS
+    # Each registered entry is callable.
+    assert callable(PRESET_FNS["doc_preset"])
+    assert callable(PRESET_FNS["file_preset"])
+
+
+def test_preset_decorator_unpacks_flat_form():
+    """The wrapper auto-unpacks {"name": "<x>", ...} into fn("<x>", **rest)."""
+    from unitysvc_data import PRESET_FNS
+
+    # Flat form via the registered wrapper should equal direct call.
+    via_registry = PRESET_FNS["doc_preset"](
+        {"name": "s3_connectivity_v1", "is_public": True}
+    )
+    via_direct = doc_preset("s3_connectivity_v1", is_public=True)
+    assert via_registry == via_direct
+
+
+def test_preset_decorator_forwards_bare_string():
+    from unitysvc_data import PRESET_FNS
+
+    via_registry = PRESET_FNS["doc_preset"]("s3_connectivity_v1")
+    via_direct = doc_preset("s3_connectivity_v1")
+    assert via_registry == via_direct
+
+
+def test_preset_decorator_preserves_original_function_signature():
+    """@preset returns the undecorated function so programmatic callers
+    keep the original signature (`**overrides`, etc.)."""
+    import inspect
+
+    sig = inspect.signature(doc_preset)
+    # If @preset had replaced doc_preset with the single-arg wrapper,
+    # we would see just `source` here.
+    assert "overrides" in sig.parameters or any(
+        p.kind is inspect.Parameter.VAR_KEYWORD for p in sig.parameters.values()
+    )
+
+
+def test_preset_decorator_does_not_duplicate_across_reimports():
+    """Re-importing the module must not double-register any preset."""
+    import importlib
+
+    import unitysvc_data._registry as reg
+
+    before = dict(reg.PRESET_FNS)
+    importlib.reload(reg)
+    # After reload, each preset appears at most once in the new registry.
+    # (We can't easily re-decorate here without re-running presets.py, but
+    # we can at least confirm the registry isn't "leaking" entries.)
+    assert set(reg.PRESET_FNS) <= set(before) | {"doc_preset", "file_preset"}
+
+
+def test_preset_decorator_register_custom_function():
+    """Third-party code can register a new sentinel type with @preset."""
+    from unitysvc_data._registry import PRESET_FNS, preset
+
+    try:
+        @preset
+        def _custom_preset(source, **kwargs):
+            return {"source": source, "kwargs": kwargs}
+
+        assert "_custom_preset" in PRESET_FNS
+        assert PRESET_FNS["_custom_preset"]({"name": "x", "flag": True}) == {
+            "source": "x",
+            "kwargs": {"flag": True},
+        }
+    finally:
+        PRESET_FNS.pop("_custom_preset", None)

unitysvc_data-0.1.3/src/unitysvc_data/_version.py

@@ -1 +0,0 @@
-__version__ = "0.1.3"