ephaptic 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

ephaptic/cli/__main__.py

@@ -1,4 +1,4 @@
-import sys, os, json, inspect, importlib, typing, typer
+import sys, os, json, inspect, importlib, typing, typer, subprocess as sp
 
 from pathlib import Path
 from pydantic import TypeAdapter
@@ -16,8 +16,8 @@ def load_ephaptic(import_name: str) -> Ephaptic:
     sys.path.insert(0, os.getcwd())
 
     if ":" not in import_name:
-        typer.secho(f"Warning: Import name did not specify app name. Defaulting to `app`.", fg=typer.colors.YELLOW)
-        import_name += ":app" # default: expect app to be named `app` inside the file
+        typer.secho(f"Warning: Import name did not specify client name. Defaulting to `client`.", fg=typer.colors.YELLOW)
+        import_name += ":client" # default: expect client to be named `client` inside the file
 
     module_name, var_name = import_name.split(":", 1)
 
@@ -35,7 +35,7 @@ def load_ephaptic(import_name: str) -> Ephaptic:
         raise typer.Exit(1)
     
     if not isinstance(instance, Ephaptic):
-        typer.secho(f"Error: '{var_name}' is not an Ephaptic instance. It is type: {type(instance)}", fg=typer.colors.RED)
+        typer.secho(f"Error: '{var_name}' is not an Ephaptic client. It is type: {type(instance)}", fg=typer.colors.RED)
         raise typer.Exit(1)
     
     return instance
@@ -53,12 +53,31 @@ def create_schema(adapter: TypeAdapter, definitions: dict) -> dict:
     
     return schema
 
+def run_subprocess():
+    cmd = [sys.executable]
+    cmd += [arg for arg in sys.argv if arg not in {'--watch', '-w'}]
+    sp.run(cmd)
+
 @app.command()
 def generate(
-    app: str = typer.Argument('app:app', help="The import string. (Default: `app:app`)"),
-    output: Path = typer.Option('schema.json', '--output', '-o', help="Output path for the JSON schema.")
+    client: str = typer.Argument('client:client', help="The import string for the Ephaptic client."),
+    output: Path = typer.Option('schema.json', '--output', '-o', help="Output path for the JSON schema."),
+    watch: bool = typer.Option(False, '--watch', '-w', help="Watch for changes in `.py` files and regenerate schema file automatically."),
 ):
-    ephaptic = load_ephaptic(app)
+    if watch:
+        import watchfiles
+        
+        cwd = os.getcwd()
+        typer.secho(f"Watching for changes ({cwd})...",  fg=typer.colors.GREEN)
+
+        run_subprocess()
+
+        for changes in watchfiles.watch(cwd):
+            if any(f.endswith('.py') for _, f in changes):
+                typer.secho("Detected changes, regenerating...")
+                run_subprocess()
+
+    ephaptic = load_ephaptic(client)
 
     typer.secho(f"Found {len(ephaptic._exposed_functions)} functions.", fg=typer.colors.GREEN)
 
@@ -97,8 +116,15 @@ def generate(
 
         schema_output["methods"][name] = method_schema
 
+    new = json.dumps(schema_output, indent=2)
+
+    if output.exists():
+        old = output.read_text()
+        if old == new:
+            return
+
     with open(output, "w") as f:
-        json.dump(schema_output, f, indent=2)
+        f.write(new)
 
     typer.secho(f"Schema generated to `{output}`.", fg=typer.colors.GREEN, bold=True)
 

ephaptic/ephaptic.py

@@ -51,9 +51,12 @@ class ConnectionManager:
         for user_id in user_ids:
             if user_id in self.active:
                 for transport in list(self.active[user_id]):
-                    try:
-                        await transport.send(payload)
-                    except: pass
+                    asyncio.create_task(self._safe_send(transport, payload))
+
+    async def _safe_send(self, transport: Transport, payload: bytes):
+        try:
+            await transport.send(payload)
+        except: ...
 
     async def start_redis(self):
         if not self.redis: return
@@ -192,7 +195,7 @@ class Ephaptic:
 
                     if func_name in self._exposed_functions:
                         target_func = self._exposed_functions[func_name]
-                        sig = inspect.signature(target_func)
+                        sig = inspect.signature(target_func)                      
                         try:
                             bound = sig.bind(*args, **kwargs)
                             bound.apply_defaults()
@@ -202,6 +205,8 @@ class Ephaptic:
 
                         hints = typing.get_type_hints(target_func)
 
+                        return_type = hints.get("return", typing.Any)
+
                         errors = []
 
                         for name, val in bound.arguments.items():
@@ -216,7 +221,11 @@ class Ephaptic:
                         if errors:
                             await transport.send(msgpack.dumps({
                                 "id": call_id,
-                                "error": errors,
+                                "error": {
+                                    "code": "VALIDATION_ERROR",
+                                    "message": "Validation failed.",
+                                    "data": errors,
+                                },
                             }))
                             continue
 
@@ -225,9 +234,21 @@ class Ephaptic:
 
                         try:
                             result = await self._async(target_func)(**bound.arguments)
-                            if isinstance(result, pydantic.BaseModel):
-                                result = result.model_dump()
+
+                            if return_type is not inspect.Signature.empty:
+                                try:
+                                    adapter = pydantic.TypeAdapter(return_type)
+                                    validated = adapter.validate_python(result, from_attributes=True)
+                                    result = adapter.dump_python(validated, mode='json')
+                                except: ...
+                            elif isinstance(result, pydantic.BaseModel):
+                                result = result.model_dump(mode='json')
+
                             await transport.send(msgpack.dumps({"id": call_id, "result": result}))
+                        # except pydantic.ValidationError as e:
+                            # Should we really treat this separately?
+                            # For input it's understandable, but for server responses it feels like a server issue.
+                            # Ok, let's treat this like any other server error.
                         except Exception as e:
                             await transport.send(msgpack.dumps({"id": call_id, "error": str(e)}))
                         finally:

{ephaptic-0.2.1.dist-info → ephaptic-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ephaptic
-Version: 0.2.1
+Version: 0.2.3
 Summary: The Python client/server package for ephaptic.
 Author-email: uukelele <robustrobot11@gmail.com>
 License: MIT License
@@ -36,6 +36,7 @@ Requires-Dist: websockets>=12.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: typer[standard]>=0.20.0
 Requires-Dist: python-dotenv
+Requires-Dist: watchfiles
 Provides-Extra: server
 Requires-Dist: redis; extra == "server"
 Dynamic: license-file
@@ -132,8 +133,7 @@ async def add(num1: int, num2: int) -> int:
     return num1 + num2
 ```
 
-> [!TIP]
-> If you're experiencing circular imports, feel free to instead import and use the `expose` function from the library instead of the instance. Please note that if you do this, you must define all exposed functions *before* creating the ephaptic instance - this is mainly for people importing RPC functions from another file. The same thing can be done with the global `identity_loader` decorator.
+###### If you're trying to expose functions statelessly, e.g. in a different file, feel free to instead import and use the `expose` function from the library instead of the instance. Please note that if you do this, you must define all exposed functions *before* creating the ephaptic instance - easily done by simply placing your import line above the ephaptic constructor. The same thing can be done with the global `identity_loader` decorator.
 
 Yep, it's really that simple.
 

{ephaptic-0.2.1.dist-info → ephaptic-0.2.3.dist-info}/RECORD

@@ -1,19 +1,19 @@
 ephaptic/__init__.py,sha256=3GmVqhbye3snH7KfnyqIt8t_w6ULnWOvDw07eB13iDA,126
-ephaptic/ephaptic.py,sha256=K9cOUk8guI6IesBACkdUxebI2UXpN-0yJfrhjHUC3iI,9034
+ephaptic/ephaptic.py,sha256=9PKqiUKWl5MWlBvqsVbpsEfBmJmZJFes0RbbeqFkX4I,10224
 ephaptic/localproxy.py,sha256=fJaaskkiD6C2zaOod0F0HNWIbdKs_JMuHFwd0-sdLIM,19477
 ephaptic/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ephaptic/adapters/fastapi_.py,sha256=yfSbJuA7Tgeh9EhZkfIve0Uj-cOZmTBljlBsCRKh2EE,1007
 ephaptic/adapters/quart_.py,sha256=MBo9g6h_zI63mL4aGdrvV5yEXsHaOd0Iv5J8SAPHBoA,537
 ephaptic/cli/__init__.py,sha256=p_mYumuQLr3HZa-6I4QKut6khZv3WQjEX-B-aa4cdEE,44
-ephaptic/cli/__main__.py,sha256=RNEL4c_MkEKV7kY9pswC1ihNToiaVb06t1aZ4dCfk9s,3389
+ephaptic/cli/__main__.py,sha256=fbfEGUnufc7vO65ZHnCV7YSshlHyif1c3kzR7vSp9GM,4218
 ephaptic/client/__init__.py,sha256=NeaPIzTFeozP54wlDYHIg_adHP3Z3LWVujsRUlpn4_U,35
 ephaptic/client/client.py,sha256=YYAlzA40xBvWsiDu0Gsd1EBJaqivLR-bSszepWdNODs,4181
 ephaptic/transports/__init__.py,sha256=kSAlgvm8sV9nHHu61LTjjTpv4bweah90xvFrwQMDQtQ,169
 ephaptic/transports/fastapi_ws.py,sha256=X0PMRcwM-KDpKA-zXShGTFhD1kHMSqrx3PBBKZtQ1W0,258
 ephaptic/transports/websocket.py,sha256=jwgclSDSq0lQCvgwjwUXe9MzPk7NH0FdmsLhWxYBh-4,261
-ephaptic-0.2.1.dist-info/licenses/LICENSE,sha256=kMpJjLKMj6zsAhf4uHApO4q0r31Ye1VyfBOl9cFW13M,1065
-ephaptic-0.2.1.dist-info/METADATA,sha256=9-6m-C21Y01fry6UHDGoQ-2LtUqYpI_rOxJZv_fzaGM,7716
-ephaptic-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ephaptic-0.2.1.dist-info/entry_points.txt,sha256=lis9vIDIrMVJM43r9ooFkb07KhrX4946duvYru3VfT4,46
-ephaptic-0.2.1.dist-info/top_level.txt,sha256=nNhdhcz2o_IuwZ9I2uWQuLZrRmSW0dQVU3qwGrb35Io,9
-ephaptic-0.2.1.dist-info/RECORD,,
+ephaptic-0.2.3.dist-info/licenses/LICENSE,sha256=kMpJjLKMj6zsAhf4uHApO4q0r31Ye1VyfBOl9cFW13M,1065
+ephaptic-0.2.3.dist-info/METADATA,sha256=ZokQJXZp3r4icuY3F8IRpqALNpEZXrCOLkgv8l2lHvk,7783
+ephaptic-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ephaptic-0.2.3.dist-info/entry_points.txt,sha256=lis9vIDIrMVJM43r9ooFkb07KhrX4946duvYru3VfT4,46
+ephaptic-0.2.3.dist-info/top_level.txt,sha256=nNhdhcz2o_IuwZ9I2uWQuLZrRmSW0dQVU3qwGrb35Io,9
+ephaptic-0.2.3.dist-info/RECORD,,