cycls 0.0.2.95__py3-none-any.whl → 0.0.2.97__py3-none-any.whl

cycls/__init__.py

@@ -1,14 +1,6 @@
-from . import function as _function_module
 from .function import function, Function
 from .app import app, App
 
-def __getattr__(name):
-    if name in ("api_key", "base_url"):
-        return getattr(_function_module, name)
-    raise AttributeError(f"module 'cycls' has no attribute '{name}'")
-
-def __setattr__(name, value):
-    if name in ("api_key", "base_url"):
-        setattr(_function_module, name, value)
-    else:
-        raise AttributeError(f"module 'cycls' has no attribute '{name}'")
+# Module-level config
+api_key = None
+base_url = None

cycls/app.py

@@ -15,13 +15,14 @@ class App(Function):
 
     def __init__(self, func, name, theme="default", pip=None, apt=None, copy=None, copy_public=None,
                  auth=False, org=None, header=None, intro=None, title=None, plan="free", analytics=False,
-                 state=False):
+                 state=False, memory="1Gi"):
         if theme not in THEMES:
             raise ValueError(f"Unknown theme: {theme}. Available: {THEMES}")
         self.user_func = func
         self.theme = theme
         self.copy_public = copy_public or []
         self.state = state
+        self.memory = memory
 
         self.config = Config(
             header=header,
@@ -79,12 +80,12 @@ class App(Function):
         self._prepare_func(prod=True)
         return super().deploy(port=port)
 
-    def _deploy(self, port=8080):
+    def _deploy(self, port=8080, memory=None):
         """Deploy to testing infrastructure."""
         if self.api_key is None:
             raise RuntimeError("Missing API key. Set cycls.api_key or CYCLS_API_KEY environment variable.")
         self._prepare_func(prod=True)
-        return super()._deploy(port=port)
+        return super()._deploy(port=port, memory=memory or self.memory)
 
 
 def app(name=None, **kwargs):

cycls/function.py

@@ -46,10 +46,14 @@ api_key = None
 base_url = None
 
 def _get_api_key():
-    return api_key or os.getenv("CYCLS_API_KEY")
+    import sys
+    cycls_pkg = sys.modules.get('cycls')
+    return api_key or (cycls_pkg and cycls_pkg.__dict__.get('api_key')) or os.getenv("CYCLS_API_KEY")
 
 def _get_base_url():
-    return base_url or os.getenv("CYCLS_BASE_URL")
+    import sys
+    cycls_pkg = sys.modules.get('cycls')
+    return base_url or (cycls_pkg and cycls_pkg.__dict__.get('base_url')) or os.getenv("CYCLS_BASE_URL")
 
 def _hash_path(path_str: str) -> str:
     h = hashlib.sha256()
@@ -91,8 +95,8 @@ class Function:
         self.apt = sorted(apt or [])
         self.run_commands = sorted(run_commands or [])
         self.copy = {f: f for f in copy} if isinstance(copy, list) else (copy or {})
-        self.base_url = base_url or "https://service-core-280879789566.me-central1.run.app"
-        self.api_key = api_key
+        self._base_url = base_url
+        self._api_key = api_key
         self.pip = sorted(set(pip or []) | {"cloudpickle"})
 
         self.image_prefix = f"cycls/{self.name}"
@@ -100,6 +104,14 @@ class Function:
         self._docker_client = None
         self._container = None
 
+    @property
+    def api_key(self):
+        return self._api_key or _get_api_key()
+
+    @property
+    def base_url(self):
+        return self._base_url or _get_base_url() or "https://service-core-280879789566.me-central1.run.app"
+
     @property
     def docker_client(self):
         if self._docker_client is None:
@@ -401,6 +413,7 @@ CMD ["python", "entrypoint.py"]
 
         base_url = self.base_url
         port = kwargs.pop('port', 8080)
+        memory = kwargs.pop('memory', '1Gi')
 
         # Check name availability before uploading
         print(f"Checking '{self.name}'...")
@@ -442,7 +455,7 @@ CMD ["python", "entrypoint.py"]
             with open(archive_path, 'rb') as f:
                 response = requests.post(
                     f"{base_url}/v1/deploy",
-                    data={"function_name": self.name, "port": port},
+                    data={"function_name": self.name, "port": port, "memory": memory},
                     files={'source_archive': (archive_name, f, 'application/gzip')},
                     headers={"X-API-Key": self.api_key},
                     timeout=9000,