cycls 0.0.2.33__py3-none-any.whl → 0.0.2.35__py3-none-any.whl

cycls/__init__.py

@@ -1,2 +1,2 @@
-from .cycls import Agent
-from .sdk import function
+from .sdk import Agent
+from .runtime import Runtime

cycls/runtime.py

@@ -9,14 +9,6 @@ from pathlib import Path
 from contextlib import contextmanager
 import tarfile
 
-# --- Docker Client Initialization ---
-try:
-    docker_client = docker.from_env()
-except docker.errors.DockerException:
-    print("❌ Error: Docker is not running or not installed.")
-    print("Please start the Docker daemon and try again.")
-    sys.exit(1)
-
 # --- Top-Level Helper Functions ---
 
 def _bootstrap_script(payload_file: str, result_file: str) -> str:
@@ -84,7 +76,7 @@ class Runtime:
     """
     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):
         self.func = func
-        self.python_version = python_version or "3.12"
+        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 [])
@@ -104,6 +96,50 @@ class Runtime:
         self.tag = self._generate_base_tag()
 
         self.api_key = api_key
+        self._docker_client = None
+        self.managed_label = f"cycls.runtime"
+
+    @property
+    def docker_client(self):
+        """
+        Lazily initializes and returns a Docker client.
+        This ensures Docker is only required for methods that actually use it.
+        """
+        if self._docker_client is None:
+            try:
+                print("🐳 Initializing Docker client...")
+                client = docker.from_env()
+                client.ping()
+                self._docker_client = client
+            except docker.errors.DockerException:
+                print("\n❌ Error: Docker is not running or is not installed.")
+                print("   This is required for local 'run' and 'build' operations.")
+                print("   Please start the Docker daemon and try again.")
+                sys.exit(1)
+        return self._docker_client
+    
+    def _perform_auto_cleanup(self):
+        """Performs a simple, automatic cleanup of old Docker resources."""
+        try:
+            for container in self.docker_client.containers.list(all=True, filters={"label": self.managed_label}):
+                container.remove(force=True)
+
+            cleaned_images = 0
+            for image in self.docker_client.images.list(name=self.image_prefix):
+                is_current = self.tag in image.tags
+                is_deployable = any(t.startswith(f"{self.image_prefix}:deploy-") for t in image.tags)
+
+                if not is_current and not is_deployable:
+                    self.docker_client.images.remove(image.id, force=True)
+                    cleaned_images += 1
+            
+            if cleaned_images > 0:
+                print(f"🧹 Cleaned up {cleaned_images} old image version(s).")
+
+            self.docker_client.images.prune(filters={'label': self.managed_label})
+
+        except Exception as e:
+            print(f"⚠️  An error occurred during cleanup: {e}")
 
     def _generate_base_tag(self) -> str:
         """Creates a unique tag for the base Docker image based on its dependencies."""
@@ -132,7 +168,11 @@ class Runtime:
             if self.apt_packages else ""
         )
         run_shell_commands = "\n".join([f"RUN {cmd}" for cmd in self.run_commands]) if self.run_commands else ""
-        copy_lines = "\n".join([f"COPY {src} {dst}" for src, dst in self.copy.items()])
+
+        # fixes absolute path copy, but causes collision
+        copy_lines = "\n".join([f"COPY {Path(src).name} {dst}" for src, dst in self.copy.items()])
+        # copy_lines = "\n".join([f"COPY {src} {dst}" for src, dst in self.copy.items()])
+
         expose_line = f"EXPOSE {port}" if port else ""
 
         return f"""
@@ -166,26 +206,31 @@ COPY {self.payload_file} {self.io_dir}/
             (workdir / self.payload_file).write_bytes(payload_bytes)
 
         if self.copy:
+            # for src in self.copy.keys():
+            #     _copy_path(Path(src), workdir / src)
+
+            # fixes absolute path copy
             for src in self.copy.keys():
-                _copy_path(Path(src), workdir / src)
+                src_path = Path(src)
+                dest_path = workdir / src_path.name if src_path.is_absolute() else workdir / src
+                _copy_path(src_path, dest_path)
 
     def _build_image_if_needed(self):
         """Checks if the base Docker image exists locally and builds it if not."""
         try:
-            docker_client.images.get(self.tag)
+            self.docker_client.images.get(self.tag)
             print(f"✅ Found cached base image: {self.tag}")
             return
         except docker.errors.ImageNotFound:
             print(f"🛠️  Building new base image: {self.tag}")
 
-        # with tempfile.TemporaryDirectory() as tmpdir_str:
-        with tempfile.TemporaryDirectory(dir="/tmp") as tmpdir_str:
+        with tempfile.TemporaryDirectory() as tmpdir_str:
             tmpdir = Path(tmpdir_str)
             # Prepare context without payload for the base image
             self._prepare_build_context(tmpdir)
             
             print("--- 🐳 Docker Build Logs (Base Image) ---")
-            response_generator = docker_client.api.build(
+            response_generator = self.docker_client.api.build(
                 path=str(tmpdir),
                 tag=self.tag,
                 forcerm=True,
@@ -206,12 +251,12 @@ COPY {self.payload_file} {self.io_dir}/
     def runner(self, *args, **kwargs):
         """Context manager to set up, run, and tear down the container for local execution."""
         port = kwargs.get('port', None)
+        self._perform_auto_cleanup()
         self._build_image_if_needed()
         container = None
         ports_mapping = {f'{port}/tcp': port} if port else None
 
-        # with tempfile.TemporaryDirectory() as tmpdir_str:
-        with tempfile.TemporaryDirectory(dir="/tmp") as tmpdir_str:
+        with tempfile.TemporaryDirectory() as tmpdir_str:
             tmpdir = Path(tmpdir_str)
             payload_path = tmpdir / self.payload_file
             result_path = tmpdir / self.result_file
@@ -220,10 +265,11 @@ COPY {self.payload_file} {self.io_dir}/
                 cloudpickle.dump((self.func, args, kwargs), f)
 
             try:
-                container = docker_client.containers.create(
+                container = self.docker_client.containers.create(
                     image=self.tag,
                     volumes={str(tmpdir): {'bind': self.io_dir, 'mode': 'rw'}},
-                    ports=ports_mapping
+                    ports=ports_mapping,
+                    labels={self.managed_label: "true"} 
                 )
                 container.start()
                 yield container, result_path
@@ -271,19 +317,18 @@ COPY {self.payload_file} {self.io_dir}/
         final_tag = f"{self.image_prefix}:deploy-{payload_hash}"
 
         try:
-            docker_client.images.get(final_tag)
+            self.docker_client.images.get(final_tag)
             print(f"✅ Found cached deployable image: {final_tag}")
             return final_tag
         except docker.errors.ImageNotFound:
             print(f"🛠️  Building new deployable image: {final_tag}")
 
-        # with tempfile.TemporaryDirectory() as tmpdir_str:
-        with tempfile.TemporaryDirectory(dir="/tmp") as tmpdir_str:
+        with tempfile.TemporaryDirectory() as tmpdir_str:
             tmpdir = Path(tmpdir_str)
             self._prepare_build_context(tmpdir, include_payload=True, args=args, kwargs=kwargs)
 
             print("--- 🐳 Docker Build Logs (Final Image) ---")
-            response_generator = docker_client.api.build(
+            response_generator = self.docker_client.api.build(
                 path=str(tmpdir), tag=final_tag, forcerm=True, decode=True
             )
             try:
@@ -309,8 +354,7 @@ COPY {self.payload_file} {self.io_dir}/
         payload_hash = hashlib.sha256(cloudpickle.dumps((self.func, args, kwargs))).hexdigest()[:16]
         archive_name = f"source-{self.tag.split(':')[1]}-{payload_hash}.tar.gz"
 
-        # with tempfile.TemporaryDirectory() as tmpdir_str:
-        with tempfile.TemporaryDirectory(dir="/tmp") as tmpdir_str:
+        with tempfile.TemporaryDirectory() as tmpdir_str:
             tmpdir = Path(tmpdir_str)
             self._prepare_build_context(tmpdir, include_payload=True, args=args, kwargs=kwargs)
             
@@ -375,8 +419,7 @@ COPY {self.payload_file} {self.io_dir}/
 
         port = kwargs.get('port', 8080)
         
-        # with tempfile.TemporaryDirectory() as tmpdir_str:
-        with tempfile.TemporaryDirectory(dir="/tmp") as tmpdir_str:
+        with tempfile.TemporaryDirectory() as tmpdir_str:
             tmpdir = Path(tmpdir_str)
             self._prepare_build_context(tmpdir, include_payload=True, args=args, kwargs=kwargs)
             

cycls/sdk.py

@@ -1,22 +1,107 @@
+import json, time, modal, inspect, uvicorn
 from .runtime import Runtime
+from modal.runner import run_app
+from .web import web
+import importlib.resources
 
-def function(python_version="3.12", pip_install=None, apt_install=None, run_commands=None, copy=None, name=None, base_url=None, api_key=None):
-    # """
-    # A decorator factory that transforms a Python function into a containerized,
-    # remotely executable object.
-
-    # Args:
-    #     pip (list[str], optional): A list of pip packages to install.
-    #     apt (list[str], optional): A list of apt packages to install.
-    #     copy (list[str], optional): A list of local paths to copy to the
-    #         same path inside the image. For static dependencies.
-    #     name (str, optional): A name for this function. Defaults to the function's name.
-
-    # Returns:
-    #     A decorator that replaces the decorated function with a Runtime instance.
-    # """
-    def decorator(func):
-        Name = name or func.__name__ # should be moved to runtime... or default?
-        copy_dict = {i:i for i in copy or []}
-        return Runtime(func, Name.replace('_', '-'), python_version, pip_install, apt_install, run_commands, copy_dict, base_url, api_key)
-    return decorator
+theme_path = importlib.resources.files('cycls').joinpath('theme')
+cycls_path = importlib.resources.files('cycls')
+
+class Agent:
+    def __init__(self, theme=theme_path, org=None, api_token=None, pip=[], apt=[], copy=[], keys=["",""], api_key=None):
+        self.org, self.api_token = org, api_token
+        self.theme = theme
+        self.keys, self.pip, self.apt, self.copy = keys, pip, apt, copy
+        self.api_key = api_key
+
+        self.registered_functions = []
+
+    def __call__(self, name=None, header="", intro="", domain=None, auth=False):
+        def decorator(f):
+            self.registered_functions.append({
+                "func": f,
+                "config": ["public", False, self.org, self.api_token, header, intro, auth],
+                # "name": name,
+                "name": name or (f.__name__).replace('_', '-'),
+                "domain": domain or f"{name}.cycls.ai",
+            })
+            return f
+        return decorator
+
+    def run(self, port=8080):
+        if not self.registered_functions:
+            print("Error: No @agent decorated function found.")
+            return
+        
+        i = self.registered_functions[0]
+        if len(self.registered_functions) > 1:
+            print(f"⚠️  Warning: Multiple agents found. Running '{i['name']}'.")
+        print(f"🚀 Starting local server at localhost:{port}")
+        i["config"][0], i["config"][6] = self.theme, False
+        uvicorn.run(web(i["func"], *i["config"]), host="0.0.0.0", port=port)
+        return
+
+    def cycls(self, prod=False, port=8080):
+        if not self.registered_functions:
+            print("Error: No @agent decorated function found.")
+            return
+        if (self.api_key is None) and prod:
+            print("🛑  Error: Please add your Cycls API key")
+            return
+
+        i = self.registered_functions[0]
+        if len(self.registered_functions) > 1:
+            print(f"⚠️  Warning: Multiple agents found. Running '{i['name']}'.")
+
+        i["config"][6] = False
+
+        copy={str(cycls_path.joinpath('theme')):"public", str(cycls_path)+"/web.py":"app/web.py"}
+        copy.update({i:i for i in self.copy})
+
+        new = Runtime(
+            func=lambda port: __import__("uvicorn").run(__import__("web").web(i["func"], *i["config"]), host="0.0.0.0", port=port),
+            name=i["name"],
+            apt_packages=self.apt,
+            pip_packages=["fastapi[standard]", "pyjwt", "cryptography", "uvicorn", *self.pip],
+            copy=copy,
+            api_key=self.api_key
+        )
+        new.deploy(port=port) if prod else new.run(port=port) 
+        return
+        
+    def push(self, prod=False):
+        self.client = modal.Client.from_credentials(*self.keys)
+        image = (modal.Image.debian_slim()
+                            .pip_install("fastapi[standard]", "pyjwt", "cryptography", *self.pip)
+                            .apt_install(*self.apt)
+                            .add_local_dir(self.theme, "/root/public")
+                            .add_local_file(str(cycls_path)+"/web.py", "/root/web.py"))
+        for item in self.copy:
+            image = image.add_local_file(item, f"/root/{item}") if "." in item else image.add_local_dir(item, f'/root/{item}')
+        self.app = modal.App("development", image=image)
+    
+        if not self.registered_functions:
+            print("Error: No @agent decorated function found.")
+            return
+
+        for i in self.registered_functions:
+            i["config"][1] = True if prod else False
+            self.app.function(serialized=True, name=i["name"])(
+                modal.asgi_app(label=i["name"], custom_domains=[i["domain"]])
+                (lambda: __import__("web").web(i["func"], *i["config"]))
+            )
+        if prod:
+            for i in self.registered_functions:
+                print(f"✅ Deployed to ⇒ https://{i['domain']}")
+            self.app.deploy(client=self.client, name=self.registered_functions[0]["name"])
+            return
+        else:
+            with modal.enable_output():
+                run_app(app=self.app, client=self.client)
+                print(" Modal development server is running. Press Ctrl+C to stop.")
+                with modal.enable_output(), run_app(app=self.app, client=self.client): 
+                    while True: time.sleep(10)
+
+# poetry config pypi-token.pypi <your-token>
+# poetry run python agent.py
+# poetry publish --build

cycls/{cycls.py → web.py}

@@ -1,8 +1,4 @@
-import json, time, modal, inspect, uvicorn
-from modal.runner import run_app
-
-import importlib.resources
-theme_path = importlib.resources.files('cycls').joinpath('theme')
+import json, inspect
 
 async def openai_encoder(stream): # clean up the meta data / new API?
     async for message in stream:
@@ -41,7 +37,6 @@ XwIDAQAB
 """
 
 def web(func, front_end_path="", prod=False, org=None, api_token=None, header="", intro="", auth=True): # API auth
-    print(front_end_path)
     from fastapi import FastAPI, Request, HTTPException, status, Depends
     from fastapi.responses import StreamingResponse , HTMLResponse
     from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
@@ -97,73 +92,4 @@ def web(func, front_end_path="", prod=False, org=None, api_token=None, header=""
                 "pk_live": "pk_live_Y2xlcmsuY3ljbHMuY29tJA", "pk_test": "pk_test_c2VsZWN0LXNsb3RoLTU4LmNsZXJrLmFjY291bnRzLmRldiQ"
             })
     app.mount("/", StaticFiles(directory=front_end_path, html=False))
-    return app
-
-class Agent:
-    def __init__(self, theme=theme_path, org=None, api_token=None, pip=[], apt=[], copy=[], keys=["",""]):
-        self.org, self.api_token = org, api_token
-        self.theme = theme
-        self.keys, self.pip, self.apt, self.copy = keys, pip, apt, copy
-
-        self.registered_functions = []
-
-    def __call__(self, name="", header="", intro="", domain=None, auth=False):
-        def decorator(f):
-            self.registered_functions.append({
-                "func": f,
-                "config": ["public", False, self.org, self.api_token, header, intro, auth],
-                "name": name,
-                "domain": domain or f"{name}.cycls.ai",
-            })
-            return f
-        return decorator
-
-    def run(self, port=8000):
-        if not self.registered_functions:
-            print("Error: No @agent decorated function found.")
-            return
-        
-        i = self.registered_functions[0]
-        if len(self.registered_functions) > 1:
-            print(f"⚠️  Warning: Multiple agents found. Running '{i['name']}'.")
-        print(f"🚀 Starting local server at localhost:{port}")
-        i["config"][0], i["config"][6] = self.theme, False
-        uvicorn.run(web(i["func"], *i["config"]), host="0.0.0.0", port=port)
-        return
-
-    def push(self, prod=False):
-        self.client = modal.Client.from_credentials(*self.keys)
-        image = (modal.Image.debian_slim()
-                            .pip_install("fastapi[standard]", "pyjwt", "cryptography", *self.pip)
-                            .apt_install(*self.apt)
-                            .add_local_dir(self.theme, "/root/public")
-                            .add_local_python_source("cycls"))        
-        for item in self.copy:
-            image = image.add_local_file(item, f"/root/{item}") if "." in item else image.add_local_dir(item, f'/root/{item}')
-        self.app = modal.App("development", image=image)
-    
-        if not self.registered_functions:
-            print("Error: No @agent decorated function found.")
-            return
-
-        for i in self.registered_functions:
-            i["config"][1] = True if prod else False
-            self.app.function(serialized=True, name=i["name"])(
-                modal.asgi_app(label=i["name"], custom_domains=[i["domain"]])
-                (lambda: web(i["func"], *i["config"]))
-            )
-        if prod:
-            for i in self.registered_functions:
-                print(f"✅ Deployed to ⇒ https://{i['domain']}")
-            self.app.deploy(client=self.client, name=self.registered_functions[0]["name"])
-            return
-        else:
-            with modal.enable_output():
-                run_app(app=self.app, client=self.client)
-                print(" Modal development server is running. Press Ctrl+C to stop.")
-                with modal.enable_output(), run_app(app=self.app, client=self.client): 
-                    while True: time.sleep(10)
-
-# poetry config pypi-token.pypi <your-token>
-# poetry run python agent.py
-# poetry publish --build
+    return app

{cycls-0.0.2.33.dist-info → cycls-0.0.2.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cycls
-Version: 0.0.2.33
+Version: 0.0.2.35
 Summary: Cycls SDK
 Author: Mohammed J. AlRujayi
 Author-email: mj@cycls.com

cycls-0.0.2.35.dist-info/RECORD

@@ -0,0 +1,9 @@
+cycls/__init__.py,sha256=ysfA4R_r_INokmpZGK2S8wf2ypLCqwyj0WdfX-hx0bs,51
+cycls/runtime.py,sha256=U0dMUs9dxgjMTbtv9dzK3MQ57g8kun0ICqA30Cx9cBA,18187
+cycls/sdk.py,sha256=gEdxYDtYE6FOWwLS33k0h5wuzwdcB9kvTMrkEBmz2iE,4573
+cycls/theme/assets/index-D0-uI8sw.js,sha256=aUsqm9HZtEJz38o-0MW12ZVeOlSeKigwc_fYJBntiyI,1068551
+cycls/theme/index.html,sha256=epB4cgSjC7xJOXpVuCwt9r7ivoGvLiXSrxsoOgINw58,895
+cycls/web.py,sha256=nSEJMUQoPaz8qjgVmsC1JiDRv9Y1UKVzTH4_pRHp_VE,4260
+cycls-0.0.2.35.dist-info/METADATA,sha256=DztQ_n4XO8rvuwGq-bN7Y028yINUNjcH3XYbjF-OKsI,5666
+cycls-0.0.2.35.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cycls-0.0.2.35.dist-info/RECORD,,

cycls-0.0.2.33.dist-info/RECORD

@@ -1,9 +0,0 @@
-cycls/__init__.py,sha256=9oKTafASGMuJbq_Sk0sfCSQKKwUD8mcdYFovDDzVuW4,50
-cycls/cycls.py,sha256=rLhssEPs4EwDbNsO5cGdKkP888dOaYToMPKVLZWan5U,7479
-cycls/runtime.py,sha256=y_ilfi418m-9ZsRvY7H7zrO0FYdhz2X-hnZ9DACaSW4,16289
-cycls/sdk.py,sha256=EcUYi0pGKtCajKzwLg3uH8CRPfc78KBHXgB6ShABxdE,1110
-cycls/theme/assets/index-D0-uI8sw.js,sha256=aUsqm9HZtEJz38o-0MW12ZVeOlSeKigwc_fYJBntiyI,1068551
-cycls/theme/index.html,sha256=epB4cgSjC7xJOXpVuCwt9r7ivoGvLiXSrxsoOgINw58,895
-cycls-0.0.2.33.dist-info/METADATA,sha256=HKNRnxvSkLwolKtk2-QUgQUGzbpKHSqv_hOx9Gpjnis,5666
-cycls-0.0.2.33.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cycls-0.0.2.33.dist-info/RECORD,,