isolate 0.12.16__py3-none-any.whl → 0.13.0__py3-none-any.whl

isolate/server/server.py

@@ -51,6 +51,17 @@ else:
 # Number of seconds to observe the queue before checking the termination
 # event.
 _Q_WAIT_DELAY = 0.1
+RUNNER_THREAD_POOL = futures.ThreadPoolExecutor(max_workers=MAX_THREADS)
+
+
+class GRPCException(Exception):
+    def __init__(self, message: str, code: StatusCode = StatusCode.INVALID_ARGUMENT):
+        super().__init__(message)
+        self.message = message
+        self.code = code
+
+    def __str__(self) -> str:
+        return f"{self.code.name}: {self.message}"
 
 
 @dataclass
@@ -158,11 +169,11 @@ class BridgeManager:
 class IsolateServicer(definitions.IsolateServicer):
     bridge_manager: BridgeManager
     default_settings: IsolateSettings = field(default_factory=IsolateSettings)
+    background_tasks: set[futures.Future] = field(default_factory=set)
 
-    def Run(
+    def _run_function(
         self,
         request: definitions.BoundFunction,
-        context: ServicerContext,
     ) -> Iterator[definitions.PartialRunResult]:
         messages: Queue[definitions.PartialRunResult] = Queue()
         environments = []
@@ -170,20 +181,14 @@ class IsolateServicer(definitions.IsolateServicer):
             try:
                 environments.append((env.force, from_grpc(env)))
             except ValueError:
-                return self.abort_with_msg(
-                    f"Unknown environment kind: {env.kind}",
-                    context,
-                )
+                raise GRPCException(f"Unknown environment kind: {env.kind}")
             except TypeError as exc:
-                return self.abort_with_msg(
-                    f"Invalid environment parameter: {str(exc)}.",
-                    context,
-                )
+                raise GRPCException(f"Invalid environment: {str(exc)}")
 
         if not environments:
-            return self.abort_with_msg(
+            raise GRPCException(
                 "At least one environment must be specified for a run!",
-                context,
+                StatusCode.INVALID_ARGUMENT,
             )
 
         run_settings = replace(
@@ -226,7 +231,7 @@ class IsolateServicer(definitions.IsolateServicer):
                     # but it is just in case.
                     environment_paths.append(future.result(timeout=0.1))
                 except EnvironmentCreationError as e:
-                    return self.abort_with_msg(f"{e}", context)
+                    raise GRPCException(f"{e}", StatusCode.INVALID_ARGUMENT)
 
             primary_path, *inheritance_paths = environment_paths
             inheritance_paths.extend(extra_inheritance_paths)
@@ -268,10 +273,9 @@ class IsolateServicer(definitions.IsolateServicer):
                     # If this is an RPC error, propagate it as is without any
                     # further processing.
                     if isinstance(exception, grpc.RpcError):
-                        return self.abort_with_msg(
-                            exception.details(),
-                            context,
-                            code=exception.code(),
+                        raise GRPCException(
+                            str(exception),
+                            exception.code(),
                         )
 
                     # Otherwise this is a bug in the agent itself, so needs
@@ -281,18 +285,50 @@ class IsolateServicer(definitions.IsolateServicer):
                     ):
                         yield from self.log(line, level=LogLevel.ERROR)
                     if isinstance(exception, AgentError):
-                        return self.abort_with_msg(
-                            str(exception),
-                            context,
-                            code=StatusCode.ABORTED,
-                        )
+                        raise GRPCException(str(exception), StatusCode.ABORTED)
                     else:
-                        return self.abort_with_msg(
+                        raise GRPCException(
                             f"An unexpected error occurred: {exception}.",
-                            context,
-                            code=StatusCode.UNKNOWN,
+                            StatusCode.UNKNOWN,
                         )
 
+    def _run_function_in_background(
+        self,
+        bound_function: definitions.BoundFunction,
+    ) -> None:
+        try:
+            for _ in self._run_function(bound_function):
+                pass
+        except GRPCException:
+            pass
+
+    def Submit(
+        self,
+        request: definitions.SubmitRequest,
+        context: ServicerContext,
+    ) -> definitions.SubmitResponse:
+        run_future = RUNNER_THREAD_POOL.submit(
+            self._run_function_in_background,
+            request.function,
+        )
+        self.background_tasks.add(run_future)
+
+        return definitions.SubmitResponse()
+
+    def Run(
+        self,
+        request: definitions.BoundFunction,
+        context: ServicerContext,
+    ) -> Iterator[definitions.PartialRunResult]:
+        try:
+            yield from self._run_function(request)
+        except GRPCException as exc:
+            return self.abort_with_msg(
+                exc.message,
+                context,
+                code=exc.code,
+            )
+
     def watch_queue_until_completed(
         self, queue: Queue, is_completed: Callable[[], bool]
     ) -> Iterator[definitions.PartialRunResult]:
@@ -366,7 +402,7 @@ def _add_log_to_queue(messages: Queue, log: Log) -> None:
 
 def main() -> None:
     server = grpc.server(
-        futures.ThreadPoolExecutor(max_workers=MAX_THREADS),
+        RUNNER_THREAD_POOL,
         options=get_default_options(),
     )
     with BridgeManager() as bridge_manager:

{isolate-0.12.16.dist-info → isolate-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.12.16
+Version: 0.13.0
 Summary: Managed isolated environments for Python
 Author-email: Features & Labels <hello@fal.ai>
 Project-URL: Issues, https://github.com/fal-ai/isolate/issues
@@ -8,7 +8,7 @@ Project-URL: Source, https://github.com/fal-ai/isolate
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: grpcio >=1.49
+Requires-Dist: grpcio ==1.64.0
 Requires-Dist: protobuf
 Requires-Dist: tblib >=1.7.0
 Requires-Dist: platformdirs
@@ -18,6 +18,7 @@ Requires-Dist: virtualenv >=20.4 ; extra == 'build'
 Requires-Dist: PyYAML >=6.0 ; extra == 'build'
 Provides-Extra: dev
 Requires-Dist: isolate[test] ; extra == 'dev'
+Requires-Dist: grpcio-tools ==1.64.0 ; extra == 'dev'
 Provides-Extra: test
 Requires-Dist: isolate[build] ; extra == 'test'
 Requires-Dist: pytest ; extra == 'test'

{isolate-0.12.16.dist-info → isolate-0.13.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 isolate/__init__.py,sha256=uXOKnONs7sXgARNgElwr4_A1sKoA6ACHVEvs3IDiX1M,127
-isolate/_isolate_version.py,sha256=bxigpDKzhomSYVhs2qwGig9Gi0LMxVUVJgPbV18aLDk,415
+isolate/_isolate_version.py,sha256=Y4u7iBqF7QJAbpBNSFA2tk5t2mrMGrI-nonxUAhVkPU,413
 isolate/_version.py,sha256=05pXvy-yr5t3I1m9JMn42Ilzpg7fa8IB2J8a3G7t1cU,274
 isolate/logs.py,sha256=R_AHUVYD18z_PhtK_mDWi9Gch79CxmwHY09hUDShtwg,2079
 isolate/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,39 +22,39 @@ isolate/connections/_local/__init__.py,sha256=6FtCKRSFBvTvjm5LNlNA-mieKEq3J7DZZR
 isolate/connections/_local/_base.py,sha256=nbeIH25wAZn1WDTGXv2HvAfFggzjJAF8GgGS4_iqNoY,6544
 isolate/connections/_local/agent_startup.py,sha256=swCs6Q0yVkDw7w-RftizHSMyJDM7DQwuP3TB0qI1ucg,1552
 isolate/connections/grpc/__init__.py,sha256=tcesLxlC36P6wSg2lBcO2egsJWMbSKwc8zFXhWac3YU,85
-isolate/connections/grpc/_base.py,sha256=ZxmAVOqy1N-k0xqw4xwmpLEXhmCoxecbJC4jXGPbGfc,5685
+isolate/connections/grpc/_base.py,sha256=ZCRpmuCTxn3fccooVdAlp4m8346uZm3Ev2sguWn5NWI,5685
 isolate/connections/grpc/agent.py,sha256=LfmLs6B_lLftU-BQ_lm-p3RR-69Ls9hwLz0FpQDts3c,7451
 isolate/connections/grpc/configuration.py,sha256=50YvGGHA9uyKg74xU_gc73j7bsFk973uIpMhmw2HhxY,788
 isolate/connections/grpc/interface.py,sha256=yt63kytgXRXrTnjePGJVdXz4LJJVSSrNkJCF1yz6FIE,2270
 isolate/connections/grpc/definitions/__init__.py,sha256=Z0453Bbjoq-Oxm2Wfi9fae-BFf8YsZwmuh88strmvxo,459
 isolate/connections/grpc/definitions/agent.proto,sha256=Hx11hHc8PKwhWzyasViLeq7JL33KsRex2-iibfWruTw,568
-isolate/connections/grpc/definitions/agent_pb2.py,sha256=FeK2Pivl6WFdK0HhV7O_0CIopACJ3vbcXYszWeA-hwA,1344
-isolate/connections/grpc/definitions/agent_pb2.pyi,sha256=y6wSOsMf0N5CJhFhVidTMM8WoDJNXMprfeO4zgl4Z-o,1970
-isolate/connections/grpc/definitions/agent_pb2_grpc.py,sha256=pZzXKSL2zsIiGTE1OiDimA0nrjzZVTGgFIXG1fcphi0,2451
+isolate/connections/grpc/definitions/agent_pb2.py,sha256=F8KVIE1CK542c7_EJKJ40LY8mPZwEqvdmgBPntAMqE0,1424
+isolate/connections/grpc/definitions/agent_pb2.pyi,sha256=kZsyy2PJX21J6n-hPN_bZPMl8UKNXGTNErdqKkmenes,1589
+isolate/connections/grpc/definitions/agent_pb2_grpc.py,sha256=7tm-RB4CTu_YmqvI7QGRll1Z1NmkMWY2Vm-4AHr57X8,3632
 isolate/connections/grpc/definitions/common.proto,sha256=4W1upvDIPezNj-Ab6FVNa-7cA9_N-2xJMJpwytRhpCw,1260
-isolate/connections/grpc/definitions/common_pb2.py,sha256=kU4hYQ04B2LNcjCjXb9m1ukb8wWVXLuASsANvXQZFbE,2344
-isolate/connections/grpc/definitions/common_pb2.pyi,sha256=J624Xc1Fp91ZFF8zdjJk1KCHNfHc2gRY8i3Aj1ofzKo,6887
-isolate/connections/grpc/definitions/common_pb2_grpc.py,sha256=xYOs94SXiNYAlFodACnsXW5QovLsHY5tCk3p76RH5Zc,158
+isolate/connections/grpc/definitions/common_pb2.py,sha256=lkpvpARZbPDrzrVkKJ-4WZWISN2kzrzJPNBUczmvkHU,2464
+isolate/connections/grpc/definitions/common_pb2.pyi,sha256=R-den8f1m7Lv2EnMXb3do3UjpO0Ncp3zSLtnKdW895c,6082
+isolate/connections/grpc/definitions/common_pb2_grpc.py,sha256=EvGJ0LYaWTflBesxg0P1nh_EeWKYKqUVRf0_plMISTs,1123
 isolate/connections/ipc/__init__.py,sha256=j2Mbsph2mRhAWmkMyrtPOz0VG-e75h1OOZLwzs6pXUo,131
 isolate/connections/ipc/_base.py,sha256=Jk715XK2ei3yBpFcwUnFZ0owQMMf5jekZFNh2WlKRT4,8009
 isolate/connections/ipc/agent.py,sha256=hGlL4x78FhRvMZ4DkVh3dk-EmWQqxHW4LIipgyOkw08,7069
 isolate/server/__init__.py,sha256=7R3GuWmxuqe0q28rVqETJN9OCrP_-Svjv9h0NR1GFL0,79
 isolate/server/health_server.py,sha256=yN7F1Q28DdX8-Zk3gef7XcQEE25XwlHwzV5GBM75aQM,1249
 isolate/server/interface.py,sha256=nGbjdxrN0p9m1LNdeds8NIoJOwPYW2NM6ktmbhfG4_s,687
-isolate/server/server.py,sha256=x8e6q-soR8UQC4KLUT9wa4AE3IjZi9Ia_VmOEtZEiDo,13608
+isolate/server/server.py,sha256=RIB9wsG_IzR7qZN-7KMTxuZ8iupjufQJxMcLfe-M_QI,14639
 isolate/server/definitions/__init__.py,sha256=f_Q3pdjMuZrjgNlbM60btFKiB1Vg8cnVyKEbp0RmU0A,572
-isolate/server/definitions/server.proto,sha256=08wnvXkK-Kco6OQaUkwm__dYSNvgOFhHO1GWRDT6y_Y,731
-isolate/server/definitions/server_pb2.py,sha256=fSH9U5UeTHUj8cQo9JIW5ie2Pr-0ATtm5pLL-MteaCA,1825
-isolate/server/definitions/server_pb2.pyi,sha256=JaI_Xd72MIyhb0pYvLBjJxpckS8Rhg9ZKbziauRQXkE,3306
-isolate/server/definitions/server_pb2_grpc.py,sha256=MsnTuwgwQM1Hw7S234DOABv9s2trf0TaVib4jh4u_6c,2548
+isolate/server/definitions/server.proto,sha256=-Wv0LAexj2GXfR3TSyGEcd3qkKgpvvQHQBEp7y3f-9Y,1002
+isolate/server/definitions/server_pb2.py,sha256=tOYlfoh2C5j1PGxAVBuKEtT5s-qeAK7iDaP9sIvOyqw,2293
+isolate/server/definitions/server_pb2.pyi,sha256=4XpTO6N7Y2oZJYJISUiOgImD6rbaV2zPbGILvQFlbOs,3635
+isolate/server/definitions/server_pb2_grpc.py,sha256=TKqGRLjAOHlW73GxbLGku1sVYcrv9nm9_QgyNtgiBPs,5324
 isolate/server/health/__init__.py,sha256=sy349GRK2YGX9KFKqDxM-jdYtBpMXjZu1QwBkjn0SsM,337
 isolate/server/health/health.proto,sha256=wE2_QD0OQAblKkEBG7sALLXEOj1mOLKG-FbC4tFopWE,455
-isolate/server/health/health_pb2.py,sha256=mCnDq0-frAddHopN_g_LueHddbW-sN5kOfntJDlAvUY,1783
-isolate/server/health/health_pb2.pyi,sha256=boMRHMlX770EuccQCFTeRgf_KA_VMgW7l9GZIwxvMok,2546
-isolate/server/health/health_pb2_grpc.py,sha256=JRluct2W4af83OYxwmcCn0vRc78zf04Num0vBApuPEo,4005
-isolate-0.12.16.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
-isolate-0.12.16.dist-info/METADATA,sha256=GYUwGs0Vlac8ds1WYrR52NRjidg9W_eEyKsGMDSAY7Q,3154
-isolate-0.12.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-isolate-0.12.16.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
-isolate-0.12.16.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
-isolate-0.12.16.dist-info/RECORD,,
+isolate/server/health/health_pb2.py,sha256=onOdP3M4Tpqhqs2PlGcyfoKe2VVKUEDx5ALeRcObb9A,1899
+isolate/server/health/health_pb2.pyi,sha256=CPyvxvDzra-1d-mBsukaJnscMUDBaqSACvo9LiXlFzo,2416
+isolate/server/health/health_pb2_grpc.py,sha256=XgsULrnRBmYIqvKr8eI7bqs6NIea5A0kkqdOOc2JHBY,5303
+isolate-0.13.0.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
+isolate-0.13.0.dist-info/METADATA,sha256=25NDyJJFojeicVDgrRns_gWAertk-gMgQkBAKnNdVgo,3209
+isolate-0.13.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+isolate-0.13.0.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
+isolate-0.13.0.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
+isolate-0.13.0.dist-info/RECORD,,