cycls 0.0.2.65__tar.gz → 0.0.2.67__tar.gz

{cycls-0.0.2.65 → cycls-0.0.2.67}/PKG-INFO

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

cycls-0.0.2.67/cycls/auth.py

@@ -0,0 +1,4 @@
+JWKS_PROD = "https://clerk.cycls.ai/.well-known/jwks.json"
+JWKS_TEST = "https://select-sloth-58.clerk.accounts.dev/.well-known/jwks.json"
+PK_LIVE = "pk_live_Y2xlcmsuY3ljbHMuYWkk"
+PK_TEST = "pk_test_c2VsZWN0LXNsb3RoLTU4LmNsZXJrLmFjY291bnRzLmRldiQ"

{cycls-0.0.2.65 → cycls-0.0.2.67}/cycls/sdk.py

@@ -1,11 +1,24 @@
-import json, time, modal, inspect, uvicorn
+import time, inspect, uvicorn
 from .runtime import Runtime
-from modal.runner import run_app
-from .web import web
+from .web import web, Config
+from .auth import PK_LIVE, PK_TEST, JWKS_PROD, JWKS_TEST
 import importlib.resources
+from pydantic import BaseModel
+from typing import Callable
 
 CYCLS_PATH = importlib.resources.files('cycls')
 
+class RegisteredAgent(BaseModel):
+    func: Callable
+    name: str
+    domain: str
+    config: Config
+
+def set_prod(config: Config, prod: bool):
+    config.prod = prod
+    config.pk = PK_LIVE if prod else PK_TEST
+    config.jwks = JWKS_PROD if prod else JWKS_TEST
+
 themes = {
     "default": CYCLS_PATH.joinpath('default-theme'),
     "dev": CYCLS_PATH.joinpath('dev-theme'),
@@ -43,13 +56,21 @@ class Agent:
             auth=True
             analytics=True
         def decorator(f):
-            self.registered_functions.append({
-                "func": f,
-                "config": ["theme", False, self.org, self.api_token, header, intro, title, auth, tier, analytics],
-                # "name": name,
-                "name": name or (f.__name__).replace('_', '-'),
-                "domain": domain or f"{name}.cycls.ai",
-            })
+            agent_name = name or f.__name__.replace('_', '-')
+            self.registered_functions.append(RegisteredAgent(
+                func=f,
+                name=agent_name,
+                domain=domain or f"{agent_name}.cycls.ai",
+                config=Config(
+                    header=header,
+                    intro=intro,
+                    title=title,
+                    auth=auth,
+                    tier=tier,
+                    analytics=analytics,
+                    org=self.org,
+                ),
+            ))
             return f
         return decorator
 
@@ -57,13 +78,14 @@ class Agent:
         if not self.registered_functions:
             print("Error: No @agent decorated function found.")
             return
-        
-        i = self.registered_functions[0]
+
+        agent = self.registered_functions[0]
         if len(self.registered_functions) > 1:
-            print(f"⚠️  Warning: Multiple agents found. Running '{i['name']}'.")
+            print(f"⚠️  Warning: Multiple agents found. Running '{agent.name}'.")
         print(f"🚀 Starting local server at localhost:{port}")
-        i["config"][0] = self.theme
-        uvicorn.run(web(i["func"], *i["config"]), host="0.0.0.0", port=port)
+        agent.config.public_path = self.theme
+        set_prod(agent.config, False)
+        uvicorn.run(web(agent.func, agent.config), host="0.0.0.0", port=port)
         return
 
     def deploy(self, prod=False, port=8080):
@@ -74,30 +96,34 @@ class Agent:
             print("🛑  Error: Please add your Cycls API key")
             return
 
-        i = self.registered_functions[0]
+        agent = self.registered_functions[0]
         if len(self.registered_functions) > 1:
-            print(f"⚠️  Warning: Multiple agents found. Running '{i['name']}'.")
+            print(f"⚠️  Warning: Multiple agents found. Running '{agent.name}'.")
 
-        # i["config"][1] = False
-        i["config"][1] = prod
+        set_prod(agent.config, prod)
+        func = agent.func
+        name = agent.name
+        config_dict = agent.config.model_dump()
 
-        copy={str(self.theme):"theme", str(CYCLS_PATH)+"/web.py":"web.py"}
-        copy.update({i:i for i in self.copy})
-        copy.update({i:f"public/{i}" for i in self.copy_public})
+        files = {str(self.theme): "theme", str(CYCLS_PATH)+"/web.py": "web.py"}
+        files.update({f: f for f in self.copy})
+        files.update({f: f"public/{f}" for f in self.copy_public})
 
         new = Runtime(
-            func=lambda port: __import__("web").serve(i["func"], i["config"], i["name"], port),
-            name=i["name"],
+            func=lambda port: __import__("web").serve(func, config_dict, name, port),
+            name=name,
             apt_packages=self.apt,
             pip_packages=["fastapi[standard]", "pyjwt", "cryptography", "uvicorn", *self.pip],
-            copy=copy,
+            copy=files,
             base_url=self.base_url,
             api_key=self.key
         )
-        new.deploy(port=port) if prod else new.run(port=port) 
+        new.deploy(port=port) if prod else new.run(port=port)
         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)
@@ -117,22 +143,26 @@ class Agent:
             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"]))
+        for agent in self.registered_functions:
+            set_prod(agent.config, prod)
+            func = agent.func
+            name = agent.name
+            domain = agent.domain
+            config_dict = agent.config.model_dump()
+            self.app.function(serialized=True, name=name)(
+                modal.asgi_app(label=name, custom_domains=[domain])
+                (lambda: __import__("web").web(func, config_dict))
             )
         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"])
+            for agent in self.registered_functions:
+                print(f"✅ Deployed to ⇒ https://{agent.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): 
+                with modal.enable_output(), run_app(app=self.app, client=self.client):
                     while True: time.sleep(10)
 
 # docker system prune -af

{cycls-0.0.2.65 → cycls-0.0.2.67}/cycls/web.py

@@ -1,10 +1,20 @@
 import json, inspect
 from pathlib import Path
-
-JWKS_PROD = "https://clerk.cycls.ai/.well-known/jwks.json"
-PK_LIVE = "pk_live_Y2xlcmsuY3ljbHMuYWkk"
-JWKS_TEST = "https://select-sloth-58.clerk.accounts.dev/.well-known/jwks.json"
-PK_TEST = "pk_test_c2VsZWN0LXNsb3RoLTU4LmNsZXJrLmFjY291bnRzLmRldiQ"
+from pydantic import BaseModel
+from typing import Optional
+
+class Config(BaseModel):
+    public_path: str = "theme"
+    header: str = ""
+    intro: str = ""
+    title: str = ""
+    prod: bool = False
+    auth: bool = False
+    tier: str = "free"
+    analytics: bool = False
+    org: Optional[str] = None
+    pk: str = ""
+    jwks: str = ""
 
 async def openai_encoder(stream):
     if inspect.isasyncgen(stream):
@@ -48,17 +58,20 @@ class Messages(list):
     def raw(self):
         return self._raw
 
-def web(func, public_path="", prod=False, org=None, api_token=None, header="", intro="", title="", auth=False, tier="", analytics=False): # API auth
+def web(func, config):
     from fastapi import FastAPI, Request, HTTPException, status, Depends
-    from fastapi.responses import StreamingResponse , HTMLResponse
+    from fastapi.responses import StreamingResponse
     from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
     import jwt
     from jwt import PyJWKClient
-    from pydantic import BaseModel, EmailStr
+    from pydantic import EmailStr
     from typing import List, Optional, Any
     from fastapi.staticfiles import StaticFiles
 
-    jwks = PyJWKClient(JWKS_PROD if prod else JWKS_TEST)
+    if isinstance(config, dict):
+        config = Config(**config)
+
+    jwks = PyJWKClient(config.jwks)
 
     class User(BaseModel):
         id: str
@@ -67,18 +80,6 @@ def web(func, public_path="", prod=False, org=None, api_token=None, header="", i
         org: Optional[str] = None
         plans: List[str] = []
 
-    class Metadata(BaseModel):
-        header: str
-        intro: str
-        title: str
-        prod: bool
-        auth: bool
-        tier: str
-        analytics: bool
-        org: Optional[str]
-        pk_live: str
-        pk_test: str
-
     class Context(BaseModel):
         messages: Any
         user: Optional[User] = None
@@ -99,7 +100,7 @@ def web(func, public_path="", prod=False, org=None, api_token=None, header="", i
     @app.post("/")
     @app.post("/chat/cycls")
     @app.post("/chat/completions")
-    async def back(request: Request, jwt: Optional[dict] = Depends(validate) if auth else None):
+    async def back(request: Request, jwt: Optional[dict] = Depends(validate) if config.auth else None):
         data = await request.json()
         messages = data.get("messages")
         user_data = jwt.get("user") if jwt else None
@@ -111,29 +112,20 @@ def web(func, public_path="", prod=False, org=None, api_token=None, header="", i
             stream = encoder(stream)
         return StreamingResponse(stream, media_type="text/event-stream")
 
-    @app.get("/metadata")
-    async def metadata():
-        return Metadata(
-            header=header,
-            intro=intro,
-            title=title,
-            prod=prod,
-            auth=auth,
-            tier=tier,
-            analytics=analytics,
-            org=org,
-            pk_live=PK_LIVE,
-            pk_test=PK_TEST
-        )
+    @app.get("/config")
+    async def get_config():
+        return config
 
     if Path("public").is_dir():
         app.mount("/public", StaticFiles(directory="public", html=True))
-    app.mount("/", StaticFiles(directory=public_path, html=True))
+    app.mount("/", StaticFiles(directory=config.public_path, html=True))
 
     return app
 
 def serve(func, config, name, port):
     import uvicorn, logging
+    if isinstance(config, dict):
+        config = Config(**config)
     logging.getLogger("uvicorn.error").addFilter(lambda r: "0.0.0.0" not in r.getMessage())
     print(f"\n🔨 {name} => http://localhost:{port}\n")
-    uvicorn.run(web(func, *config), host="0.0.0.0", port=port)
+    uvicorn.run(web(func, config), host="0.0.0.0", port=port)

{cycls-0.0.2.65 → cycls-0.0.2.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycls"
-version = "0.0.2.65"
+version = "0.0.2.67"
 
 packages = [{ include = "cycls" }]
 include = ["cycls/theme/**/*"]