cycls 0.0.2.67__py3-none-any.whl → 0.0.2.69__py3-none-any.whl

cycls/runtime.py

@@ -9,6 +9,9 @@ from pathlib import Path
 from contextlib import contextmanager
 import tarfile
 
+# Enable BuildKit for faster builds with better caching
+os.environ["DOCKER_BUILDKIT"] = "1"
+
 # --- Top-Level Helper Functions ---
 
 def _bootstrap_script(payload_file: str, result_file: str) -> str:
@@ -68,16 +71,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 +94,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 +159,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 +178,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 +193,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}"]
@@ -309,6 +328,110 @@ COPY {self.payload_file} {self.io_dir}/
             print(f"\n🛑 Operation stopped: {e}")
             return None
 
+    def watch(self, *args, **kwargs):
+        """Runs the container with file watching - restarts script on changes."""
+        try:
+            from watchfiles import watch as watchfiles_watch
+        except ImportError:
+            print("❌ watchfiles not installed. Run: pip install watchfiles")
+            return
+
+        import inspect
+
+        # Get the main script (the outermost .py file in the stack)
+        main_script = None
+        for frame_info in inspect.stack():
+            filename = frame_info.filename
+            if filename.endswith('.py') and not filename.startswith('<'):
+                main_script = Path(filename).resolve()
+        # main_script is now the outermost/first script in the call chain
+
+        # Build watch paths: main script + copy sources
+        watch_paths = []
+        if main_script and main_script.exists():
+            watch_paths.append(main_script)
+        watch_paths.extend([Path(src).resolve() for src in self.copy.keys() if Path(src).exists()])
+
+        if not watch_paths:
+            print("⚠️  No files to watch. Running without watch mode.")
+            return self.run(*args, **kwargs)
+
+        print(f"👀 Watching for changes:")
+        for p in watch_paths:
+            print(f"   {p}")
+        print()
+
+        while True:
+            # Run the container in a subprocess-like manner
+            print(f"🚀 Running function '{self.name}' in container...")
+            self._perform_auto_cleanup()
+            self._build_image_if_needed()
+
+            port = kwargs.get('port', None)
+            ports_mapping = {f'{port}/tcp': port} if port else None
+
+            with tempfile.TemporaryDirectory() as tmpdir_str:
+                tmpdir = Path(tmpdir_str)
+                payload_path = tmpdir / self.payload_file
+
+                with payload_path.open('wb') as f:
+                    cloudpickle.dump((self.func, args, kwargs), f)
+
+                container = self.docker_client.containers.create(
+                    image=self.tag,
+                    volumes={str(tmpdir): {'bind': self.io_dir, 'mode': 'rw'}},
+                    ports=ports_mapping,
+                    labels={self.managed_label: "true"}
+                )
+                container.start()
+                print(f"✅ Container running on port {port}")
+                print("👀 Waiting for file changes... (Ctrl+C to stop)\n")
+
+                try:
+                    # Watch for changes in a separate thread
+                    import threading
+                    import time
+                    change_detected = threading.Event()
+
+                    def watch_thread():
+                        for changes in watchfiles_watch(*watch_paths):
+                            changed_files = [str(c[1]) for c in changes]
+                            print(f"\n🔄 Changes detected:")
+                            for f in changed_files:
+                                print(f"   {f}")
+                            change_detected.set()
+                            break
+
+                    watcher = threading.Thread(target=watch_thread, daemon=True)
+                    watcher.start()
+
+                    # Stream container logs in separate thread
+                    def log_thread():
+                        for chunk in container.logs(stream=True, follow=True):
+                            if change_detected.is_set():
+                                break
+                            print(chunk.decode('utf-8').strip())
+
+                    logger = threading.Thread(target=log_thread, daemon=True)
+                    logger.start()
+
+                    # Wait for change or interrupt
+                    while not change_detected.is_set():
+                        time.sleep(0.5)
+
+                    print("\n🔄 Restarting...")
+                    container.stop(timeout=2)
+                    container.remove()
+                    # Re-exec the main script
+                    print(f"🔄 Re-executing {main_script.name}...\n")
+                    os.execv(sys.executable, [sys.executable, str(main_script)])
+
+                except KeyboardInterrupt:
+                    print("\n🛑 Stopping...")
+                    container.stop(timeout=2)
+                    container.remove()
+                    return
+
     def build(self, *args, **kwargs):
         """Builds a self-contained, deployable Docker image locally."""
         print("📦 Building self-contained image for deployment...")

cycls/sdk.py

@@ -88,13 +88,16 @@ class Agent:
         uvicorn.run(web(agent.func, agent.config), host="0.0.0.0", port=port)
         return
 
-    def deploy(self, prod=False, port=8080):
+    def deploy(self, prod=False, port=8080, watch=False):
         if not self.registered_functions:
             print("Error: No @agent decorated function found.")
             return
         if (self.key is None) and prod:
             print("🛑  Error: Please add your Cycls API key")
             return
+        if prod and watch:
+            print("⚠️  Warning: watch=True ignored in production mode.")
+            watch = False
 
         agent = self.registered_functions[0]
         if len(self.registered_functions) > 1:
@@ -118,7 +121,12 @@ class Agent:
             base_url=self.base_url,
             api_key=self.key
         )
-        new.deploy(port=port) if prod else new.run(port=port)
+        if prod:
+            new.deploy(port=port)
+        elif watch:
+            new.watch(port=port)
+        else:
+            new.run(port=port)
         return
         
     def modal(self, prod=False):

{cycls-0.0.2.67.dist-info → cycls-0.0.2.69.dist-info}/METADATA

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

{cycls-0.0.2.67.dist-info → cycls-0.0.2.69.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=PqHIJdq1pvOTKm1c5vaG6DTMUsjdMzIjzcxrqw3aN9E,6744
+cycls/runtime.py,sha256=BaP5sLG3NLPQZwuKwoYueC3R5WeuNg2-YzOQes6paUE,23221
+cycls/sdk.py,sha256=iOSFFPSN2iGCTIL2ZBOpb2X5jjUEm7gQbAuanYHF4qg,6974
 cycls/web.py,sha256=3M3qaWTNY3dpgd7Vq5aXREp-cIFsHrDqBQ1YkGrOaUk,4659
-cycls-0.0.2.67.dist-info/METADATA,sha256=fVNjmTlSIa9GAQiLvWsrEZO3v7izpZrYj6KTRngEPD4,7943
-cycls-0.0.2.67.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cycls-0.0.2.67.dist-info/RECORD,,
+cycls-0.0.2.69.dist-info/METADATA,sha256=3nG949VOjQ1K-sftwDGsAQheGAt-GCKWGUmDgUBgOP4,7943
+cycls-0.0.2.69.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cycls-0.0.2.69.dist-info/RECORD,,