cap-sdk-python 2.0.4__tar.gz → 2.0.6__tar.gz

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cap-sdk-python
-Version: 2.0.4
+Version: 2.0.6
 Summary: CAP (coretex Agent Protocol) Python SDK
 Project-URL: Homepage, https://github.com/coretexos/cap
 Requires-Python: >=3.9
@@ -46,6 +46,28 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
    asyncio.run(worker.run_worker("nats://127.0.0.1:4222", "job.echo", handle))
    ```
 
+4. Submit a job (client):
+   ```python
+   import asyncio
+   from cryptography.hazmat.primitives.asymmetric import ec
+   from cap import client
+   from cap.pb.coretex.agent.v1 import job_pb2
+   import nats
+
+   async def main():
+       nc = await nats.connect("nats://127.0.0.1:4222")
+       priv = ec.generate_private_key(ec.SECP256R1())
+       req = job_pb2.JobRequest(
+           job_id="job-echo-1",
+           topic="job.echo",
+           context_ptr="redis://ctx/job-echo-1",
+       )
+       await client.submit_job(nc, req, "trace-1", "client-py", priv)
+       await nc.drain()
+
+   asyncio.run(main())
+   ```
+
 ## Files
 - `cap/bus.py` — NATS connector.
 - `cap/worker.py` — worker skeleton with handler hook.
@@ -55,5 +77,14 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
 ## Defaults
 - Subjects: `sys.job.submit`, `sys.job.result`, `sys.heartbeat`.
 - Protocol version: `1`.
+- Signing: `submit_job` and `run_worker` sign envelopes when given an `ec.EllipticCurvePrivateKey`. Generate a keypair with `cryptography`:
+  ```python
+  from cryptography.hazmat.primitives.asymmetric import ec
+  priv = ec.generate_private_key(ec.SECP256R1())
+  pub = priv.public_key()
+  ```
+- Set `public_keys` on `run_worker` to verify incoming packets.
+- Omit `public_keys` to accept unsigned packets.
+- Pass `private_key=None` to `submit_job` if you want to send unsigned envelopes.
 
 Swap out `cap.bus` if you need a different transport.

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/README.md

@@ -35,6 +35,28 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
    asyncio.run(worker.run_worker("nats://127.0.0.1:4222", "job.echo", handle))
    ```
 
+4. Submit a job (client):
+   ```python
+   import asyncio
+   from cryptography.hazmat.primitives.asymmetric import ec
+   from cap import client
+   from cap.pb.coretex.agent.v1 import job_pb2
+   import nats
+
+   async def main():
+       nc = await nats.connect("nats://127.0.0.1:4222")
+       priv = ec.generate_private_key(ec.SECP256R1())
+       req = job_pb2.JobRequest(
+           job_id="job-echo-1",
+           topic="job.echo",
+           context_ptr="redis://ctx/job-echo-1",
+       )
+       await client.submit_job(nc, req, "trace-1", "client-py", priv)
+       await nc.drain()
+
+   asyncio.run(main())
+   ```
+
 ## Files
 - `cap/bus.py` — NATS connector.
 - `cap/worker.py` — worker skeleton with handler hook.
@@ -44,5 +66,14 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
 ## Defaults
 - Subjects: `sys.job.submit`, `sys.job.result`, `sys.heartbeat`.
 - Protocol version: `1`.
+- Signing: `submit_job` and `run_worker` sign envelopes when given an `ec.EllipticCurvePrivateKey`. Generate a keypair with `cryptography`:
+  ```python
+  from cryptography.hazmat.primitives.asymmetric import ec
+  priv = ec.generate_private_key(ec.SECP256R1())
+  pub = priv.public_key()
+  ```
+- Set `public_keys` on `run_worker` to verify incoming packets.
+- Omit `public_keys` to accept unsigned packets.
+- Pass `private_key=None` to `submit_job` if you want to send unsigned envelopes.
 
 Swap out `cap.bus` if you need a different transport.

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/cap/bus.py

@@ -1,8 +1,6 @@
 import asyncio
 from typing import Optional
 
-import nats
-
 
 class NATSConfig:
     def __init__(
@@ -21,6 +19,10 @@ class NATSConfig:
 
 
 async def connect_nats(cfg: NATSConfig):
+    try:
+        import nats  # type: ignore
+    except ImportError as exc:
+        raise RuntimeError("nats-py is required to connect to NATS") from exc
     opts = {"servers": cfg.url, "name": cfg.name}
     if cfg.token:
         opts["token"] = cfg.token

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/cap/client.py

@@ -1,16 +1,21 @@
-import nats
 from google.protobuf import timestamp_pb2
 from cap.pb.coretex.agent.v1 import buspacket_pb2
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import hashes
-import hashlib
+from typing import Optional
 
 
 DEFAULT_PROTOCOL_VERSION = 1
 SUBJECT_SUBMIT = "sys.job.submit"
 
 
-async def submit_job(nc, job_request, trace_id: str, sender_id: str, private_key: ec.EllipticCurvePrivateKey):
+async def submit_job(
+    nc,
+    job_request,
+    trace_id: str,
+    sender_id: str,
+    private_key: Optional[ec.EllipticCurvePrivateKey] = None,
+):
     ts = timestamp_pb2.Timestamp()
     ts.GetCurrentTime()
     packet = buspacket_pb2.BusPacket()
@@ -20,9 +25,9 @@ async def submit_job(nc, job_request, trace_id: str, sender_id: str, private_key
     packet.protocol_version = DEFAULT_PROTOCOL_VERSION
     packet.job_request.CopyFrom(job_request)
 
-    unsigned_data = packet.SerializeToString()
-    digest = hashlib.sha256(unsigned_data).digest()
-    signature = private_key.sign(digest, ec.ECDSA(hashes.SHA256()))
-    packet.signature = signature
+    if private_key:
+        unsigned_data = packet.SerializeToString()
+        signature = private_key.sign(unsigned_data, ec.ECDSA(hashes.SHA256()))
+        packet.signature = signature
 
     await nc.publish(SUBJECT_SUBMIT, packet.SerializeToString())

cap_sdk_python-2.0.6/cap/pb/__init__.py

@@ -0,0 +1,7 @@
+import os
+import sys
+
+# Allow generated stubs to resolve `coretex.*` absolute imports.
+_pb_root = os.path.dirname(__file__)
+if _pb_root not in sys.path:
+    sys.path.insert(0, _pb_root)

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/cap/worker.py

@@ -1,12 +1,10 @@
 import asyncio
 from typing import Callable, Awaitable, Dict
 
-import nats
 from google.protobuf import timestamp_pb2
 from cap.pb.coretex.agent.v1 import buspacket_pb2, job_pb2
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import hashes
-import hashlib
 
 DEFAULT_PROTOCOL_VERSION = 1
 SUBJECT_RESULT = "sys.job.result"
@@ -16,9 +14,16 @@ async def run_worker(nats_url: str, subject: str, handler: Callable[[job_pb2.Job
                      public_keys: Dict[str, ec.EllipticCurvePublicKey] = None,
                      private_key: ec.EllipticCurvePrivateKey = None,
                      sender_id: str = "cap-worker",
-                     connect_fn: Callable = nats.connect):
+                     connect_fn: Callable = None):
 
     # Allow injection for tests; defaults to nats.connect.
+    if connect_fn is None:
+        try:
+            import nats  # type: ignore
+        except ImportError as exc:
+            raise RuntimeError("nats-py is required to connect to NATS") from exc
+        connect_fn = nats.connect
+
     nc = await connect_fn(servers=nats_url, name=sender_id)
 
     async def on_msg(msg):
@@ -34,9 +39,8 @@ async def run_worker(nats_url: str, subject: str, handler: Callable[[job_pb2.Job
             signature = packet.signature
             packet.ClearField("signature")
             unsigned_data = packet.SerializeToString()
-            digest = hashlib.sha256(unsigned_data).digest()
             try:
-                public_key.verify(signature, digest, ec.ECDSA(hashes.SHA256()))
+                public_key.verify(signature, unsigned_data, ec.ECDSA(hashes.SHA256()))
             except Exception:
                 print(f"worker: invalid signature from sender: {packet.sender_id}")
                 return
@@ -46,12 +50,22 @@ async def run_worker(nats_url: str, subject: str, handler: Callable[[job_pb2.Job
             return
         try:
             res = await handler(req)
+            if res is None:
+                res = job_pb2.JobResult(
+                    job_id=req.job_id,
+                    status=job_pb2.JOB_STATUS_FAILED,
+                    error_message="handler returned null",
+                )
         except Exception as exc:  # noqa: BLE001
             res = job_pb2.JobResult(
                 job_id=req.job_id,
                 status=job_pb2.JOB_STATUS_FAILED,
                 error_message=str(exc),
             )
+        if not res.job_id:
+            res.job_id = req.job_id
+        if not res.worker_id:
+            res.worker_id = sender_id
         ts = timestamp_pb2.Timestamp()
         ts.GetCurrentTime()
         out = buspacket_pb2.BusPacket()
@@ -63,8 +77,7 @@ async def run_worker(nats_url: str, subject: str, handler: Callable[[job_pb2.Job
 
         if private_key:
             unsigned_data = out.SerializeToString()
-            digest = hashlib.sha256(unsigned_data).digest()
-            signature = private_key.sign(digest, ec.ECDSA(hashes.SHA256()))
+            signature = private_key.sign(unsigned_data, ec.ECDSA(hashes.SHA256()))
             out.signature = signature
 
         await nc.publish(SUBJECT_RESULT, out.SerializeToString())

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/cap_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cap-sdk-python
-Version: 2.0.4
+Version: 2.0.6
 Summary: CAP (coretex Agent Protocol) Python SDK
 Project-URL: Homepage, https://github.com/coretexos/cap
 Requires-Python: >=3.9
@@ -46,6 +46,28 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
    asyncio.run(worker.run_worker("nats://127.0.0.1:4222", "job.echo", handle))
    ```
 
+4. Submit a job (client):
+   ```python
+   import asyncio
+   from cryptography.hazmat.primitives.asymmetric import ec
+   from cap import client
+   from cap.pb.coretex.agent.v1 import job_pb2
+   import nats
+
+   async def main():
+       nc = await nats.connect("nats://127.0.0.1:4222")
+       priv = ec.generate_private_key(ec.SECP256R1())
+       req = job_pb2.JobRequest(
+           job_id="job-echo-1",
+           topic="job.echo",
+           context_ptr="redis://ctx/job-echo-1",
+       )
+       await client.submit_job(nc, req, "trace-1", "client-py", priv)
+       await nc.drain()
+
+   asyncio.run(main())
+   ```
+
 ## Files
 - `cap/bus.py` — NATS connector.
 - `cap/worker.py` — worker skeleton with handler hook.
@@ -55,5 +77,14 @@ Asyncio-first SDK with NATS helpers for CAP workers and clients.
 ## Defaults
 - Subjects: `sys.job.submit`, `sys.job.result`, `sys.heartbeat`.
 - Protocol version: `1`.
+- Signing: `submit_job` and `run_worker` sign envelopes when given an `ec.EllipticCurvePrivateKey`. Generate a keypair with `cryptography`:
+  ```python
+  from cryptography.hazmat.primitives.asymmetric import ec
+  priv = ec.generate_private_key(ec.SECP256R1())
+  pub = priv.public_key()
+  ```
+- Set `public_keys` on `run_worker` to verify incoming packets.
+- Omit `public_keys` to accept unsigned packets.
+- Pass `private_key=None` to `submit_job` if you want to send unsigned envelopes.
 
 Swap out `cap.bus` if you need a different transport.

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cap-sdk-python"
-version = "2.0.4"
+version = "2.0.6"
 description = "CAP (coretex Agent Protocol) Python SDK"
 readme = "README.md"
 requires-python = ">=3.9"

{cap_sdk_python-2.0.4 → cap_sdk_python-2.0.6}/tests/test_sdk.py

@@ -4,10 +4,14 @@ import os
 import unittest
 from typing import Callable, Awaitable, Dict
 
+_repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
+_sdk_root = os.path.join(_repo_root, "sdk", "python")
+
 # Avoid loading duplicate generated stubs from both /python and sdk/python/cap/pb.
 sys.path = [p for p in sys.path if not p.rstrip("/").endswith("python")]
-# Ensure generated modules under sdk/python/cap/pb are discoverable for `coretex.agent.v1.*`.
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "cap", "pb")))
+# Ensure the SDK package and generated modules are discoverable from repo root.
+sys.path.insert(0, _sdk_root)
+sys.path.append(os.path.join(_sdk_root, "cap", "pb"))
 
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import hashes
@@ -85,14 +89,12 @@ class TestSDK(unittest.TestCase):
 
             # Verify the signature of the result
             from cap.pb.coretex.agent.v1 import buspacket_pb2
-            import hashlib
             result_packet = buspacket_pb2.BusPacket()
             result_packet.ParseFromString(data)
             signature = result_packet.signature
             result_packet.ClearField("signature")
             unsigned_data = result_packet.SerializeToString()
-            digest = hashlib.sha256(unsigned_data).digest()
-            worker_key.public_key().verify(signature, digest, ec.ECDSA(hashes.SHA256()))
+            worker_key.public_key().verify(signature, unsigned_data, ec.ECDSA(hashes.SHA256()))
 
             worker_task.cancel()