cycls 0.0.2.66__py3-none-any.whl → 0.0.2.68__py3-none-any.whl

cycls/runtime.py

@@ -68,16 +68,22 @@ def _copy_path(src_path: Path, dest_path: Path):
         dest_path.parent.mkdir(parents=True, exist_ok=True)
         shutil.copy(src_path, dest_path)
 
+# Pre-built base image with common dependencies
+BASE_IMAGE = "ghcr.io/cycls/base:python3.12"
+BASE_PACKAGES = {
+    "cloudpickle", "cryptography", "fastapi", "fastapi[standard]",
+    "pydantic", "pyjwt", "uvicorn", "uvicorn[standard]", "httpx"
+}
+
 # --- Main Runtime Class ---
 
 class Runtime:
     """
     Handles building a Docker image and executing a function within a container.
     """
-    def __init__(self, func, name, python_version=None, pip_packages=None, apt_packages=None, run_commands=None, copy=None, base_url=None, api_key=None):
+    def __init__(self, func, name, python_version=None, pip_packages=None, apt_packages=None, run_commands=None, copy=None, base_url=None, api_key=None, base_image=None):
         self.func = func
         self.python_version = python_version or f"{sys.version_info.major}.{sys.version_info.minor}"
-        self.pip_packages = sorted(pip_packages or [])
         self.apt_packages = sorted(apt_packages or [])
         self.run_commands = sorted(run_commands or [])
         self.copy = copy or {}
@@ -85,6 +91,11 @@ class Runtime:
         self.base_url = base_url or "https://service-core-280879789566.me-central1.run.app"
         self.image_prefix = f"cycls/{name}"
 
+        # Use pre-built base image by default, filter out already-installed packages
+        self.base_image = base_image or BASE_IMAGE
+        all_pip = set(pip_packages or [])
+        self.pip_packages = sorted(all_pip - BASE_PACKAGES) if self.base_image == BASE_IMAGE else sorted(all_pip)
+
         # Standard paths and filenames used inside the container
         self.io_dir = "/app/io"
         self.runner_filename = "runner.py"
@@ -145,6 +156,7 @@ class Runtime:
     def _generate_base_tag(self) -> str:
         """Creates a unique tag for the base Docker image based on its dependencies."""
         signature_parts = [
+            self.base_image,
             "".join(self.python_version),
             "".join(self.pip_packages),
             "".join(self.apt_packages),
@@ -163,7 +175,11 @@ class Runtime:
 
     def _generate_dockerfile(self, port=None) -> str:
         """Generates a multi-stage Dockerfile string."""
-        run_pip_install = f"RUN pip install --no-cache-dir cloudpickle {' '.join(self.pip_packages)}"
+        # Only install extra packages not in base image
+        run_pip_install = (
+            f"RUN pip install --no-cache-dir {' '.join(self.pip_packages)}"
+            if self.pip_packages else ""
+        )
         run_apt_install = (
             f"RUN apt-get update && apt-get install -y --no-install-recommends {' '.join(self.apt_packages)}"
             if self.apt_packages else ""
@@ -174,14 +190,14 @@ class Runtime:
 
         return f"""
 # STAGE 1: Base image with all dependencies
-FROM python:{self.python_version}-slim as base
+FROM {self.base_image} as base
 ENV PIP_ROOT_USER_ACTION=ignore
 ENV PYTHONUNBUFFERED=1
 RUN mkdir -p {self.io_dir}
 {run_apt_install}
 {run_pip_install}
 {run_shell_commands}
-WORKDIR app
+WORKDIR /app
 {copy_lines}
 COPY {self.runner_filename} {self.runner_path}
 ENTRYPOINT ["python", "{self.runner_path}", "{self.io_dir}"]

cycls/sdk.py

@@ -1,6 +1,5 @@
-import json, time, modal, inspect, uvicorn
+import time, inspect, uvicorn
 from .runtime import Runtime
-from modal.runner import run_app
 from .web import web, Config
 from .auth import PK_LIVE, PK_TEST, JWKS_PROD, JWKS_TEST
 import importlib.resources
@@ -123,6 +122,8 @@ class Agent:
         return
         
     def modal(self, prod=False):
+        import modal
+        from modal.runner import run_app
         self.client = modal.Client.from_credentials(*self.modal_keys)
         image = (modal.Image.debian_slim()
                             .pip_install("fastapi[standard]", "pyjwt", "cryptography", *self.pip)

{cycls-0.0.2.66.dist-info → cycls-0.0.2.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cycls
-Version: 0.0.2.66
+Version: 0.0.2.68
 Summary: Distribute Intelligence
 Author: Mohammed J. AlRujayi
 Author-email: mj@cycls.com

{cycls-0.0.2.66.dist-info → cycls-0.0.2.68.dist-info}/RECORD

@@ -4,9 +4,9 @@ cycls/default-theme/assets/index-B0ZKcm_V.css,sha256=wK9-NhEB8xPcN9Zv69zpOcfGTlF
 cycls/default-theme/assets/index-D5EDcI4J.js,sha256=sN4qRcAXa7DBd9JzmVcCoCwH4l8cNCM-U9QGUjBvWSo,1346506
 cycls/default-theme/index.html,sha256=bM-yW_g0cGrV40Q5yY3ccY0fM4zI1Wuu5I8EtGFJIxs,828
 cycls/dev-theme/index.html,sha256=QJBHkdNuMMiwQU7o8dN8__8YQeQB45D37D-NCXIWB2Q,11585
-cycls/runtime.py,sha256=hLBtwtGz0FCW1-EPCJy6kMdF2fB3i6Df_H8-bm7qeK0,18223
-cycls/sdk.py,sha256=jT6t2btthVI8Bdp0-BttS4apaH0k7GCobUHxE9BTUj4,6728
+cycls/runtime.py,sha256=oAaqYbY58mIbXzQbWoNpbHyOA9py-7ZDnrEoPLXxHfE,18847
+cycls/sdk.py,sha256=PqHIJdq1pvOTKm1c5vaG6DTMUsjdMzIjzcxrqw3aN9E,6744
 cycls/web.py,sha256=3M3qaWTNY3dpgd7Vq5aXREp-cIFsHrDqBQ1YkGrOaUk,4659
-cycls-0.0.2.66.dist-info/METADATA,sha256=g9ehLjsx8yYm6muJ_16lNlCzPtKchy2LlTjFP5nwzHk,7943
-cycls-0.0.2.66.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cycls-0.0.2.66.dist-info/RECORD,,
+cycls-0.0.2.68.dist-info/METADATA,sha256=l8vds3aonBPjG6Q0oO8BkvDynM-3MEC9Yh4hFbb5I4M,7943
+cycls-0.0.2.68.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cycls-0.0.2.68.dist-info/RECORD,,