nebu 0.1.88__py3-none-any.whl → 0.1.93__py3-none-any.whl

nebu/cache.py

@@ -7,6 +7,8 @@ import redis
 import socks  # Add socks import
 from pydantic import BaseModel, Field
 
+from nebu.logging import logger  # Import the logger
+
 
 class OwnedValue(BaseModel):
     created_at: int = Field(default_factory=lambda: int(time.time()))
@@ -30,11 +32,11 @@ class Cache:
         Also checks for REDIS_URL and prefers that if set.
         """
         redis_url = os.environ.get("REDIS_URL")
-        print("REDIS_URL: ", redis_url)
+        logger.debug(f"REDIS_URL: {redis_url}")
         namespace = os.environ.get("NEBU_NAMESPACE")
         if not namespace:
             raise ValueError("NEBU_NAMESPACE environment variable is not set")
-        print("NAMESPACE: ", namespace)
+        logger.debug(f"NAMESPACE: {namespace}")
         self.redis_client = None
         connection_info = ""
 
@@ -43,9 +45,11 @@ class Cache:
             # Use the proxy settings provided by tailscaled
             socks.set_default_proxy(socks.SOCKS5, "localhost", 1055)
             socket.socket = socks.socksocket
-            print("Configured SOCKS5 proxy for socket connections via localhost:1055")
+            logger.info(
+                "Configured SOCKS5 proxy for socket connections via localhost:1055"
+            )
         except Exception as proxy_err:
-            print(f"Failed to configure SOCKS proxy: {proxy_err}")
+            logger.warning(f"Failed to configure SOCKS proxy: {proxy_err}")
             # Depending on requirements, you might want to raise an error here
             # or proceed without the proxy if it's optional.
             # For now, we'll print the error and continue, but the Redis connection
@@ -70,12 +74,12 @@ class Cache:
 
             # Ping the server to ensure connection is established
             self.redis_client.ping()
-            print(f"Successfully connected to Redis using {connection_info}")
+            logger.info(f"Successfully connected to Redis using {connection_info}")
 
             self.prefix = f"cache:{namespace}"
-            print("using prefix", self.prefix)
+            logger.info(f"Using cache prefix: {self.prefix}")
         except Exception as e:
-            print(f"Error connecting to Redis: {e}")
+            logger.error(f"Error connecting to Redis: {e}")
             # Ensure client is None if connection fails at any point
             self.redis_client = None
 
@@ -85,7 +89,7 @@ class Cache:
         Returns None if the key does not exist or connection failed.
         """
         if not self.redis_client:
-            print("Redis client not connected.")
+            logger.warning("Redis client not connected.")
             return None
         try:
             key = f"{self.prefix}:{key}"
@@ -93,7 +97,7 @@ class Cache:
             result = self.redis_client.get(key)
             return cast(str | None, result)
         except Exception as e:
-            print(f"Error getting key '{key}' from Redis: {e}")
+            logger.error(f"Error getting key '{key}' from Redis: {e}")
             return None
 
     def set(self, key: str, value: str, expiry_seconds: int | None = None) -> bool:
@@ -103,7 +107,7 @@ class Cache:
         Returns True if successful, False otherwise (e.g., connection failed).
         """
         if not self.redis_client:
-            print("Redis client not connected.")
+            logger.warning("Redis client not connected.")
             return False
         try:
             key = f"{self.prefix}:{key}"
@@ -116,5 +120,5 @@ class Cache:
                 result = self.redis_client.set(key, value)
                 return cast(bool, result)
         except Exception as e:
-            print(f"Error setting key '{key}' in Redis: {e}")
+            logger.error(f"Error setting key '{key}' in Redis: {e}")
             return False

nebu/containers/container.py

@@ -18,6 +18,7 @@ from nebu.containers.models import (
     V1SSHKey,
     V1VolumePath,
 )
+from nebu.logging import logger  # Import the logger
 from nebu.meta import V1ResourceReference
 
 
@@ -42,18 +43,19 @@ class Container:
         proxy_port: Optional[int] = None,
         authz: Optional[V1AuthzConfig] = None,
         config: Optional[GlobalConfig] = None,
+        api_key: Optional[str] = None,
     ):
         # Fallback to a default config if none is provided
         config = config or GlobalConfig.read()
         current_server = config.get_current_server_config()
         if not current_server:
             raise ValueError("No current server config found")
-        self.api_key = current_server.api_key
+        self.api_key = api_key or current_server.api_key
         self.nebu_host = current_server.server
         self.config = config
 
-        # print(f"nebu_host: {self.nebu_host}")
-        # print(f"api_key: {self.api_key}")
+        logger.debug(f"nebu_host: {self.nebu_host}")
+        logger.debug(f"api_key: {self.api_key}")
 
         # Construct the containers base URL
         self.containers_url = f"{self.nebu_host}/v1/containers"
@@ -71,7 +73,7 @@ class Container:
         )
 
         containers = V1Containers.model_validate(response.json())
-        print(f"containers: {containers}")
+        logger.debug(f"containers: {containers}")
         existing = next(
             (
                 c
@@ -81,7 +83,7 @@ class Container:
             None,
         )
 
-        print(f"existing: {existing}")
+        logger.debug(f"existing: {existing}")
 
         if not existing:
             # If there's no existing container, create one:
@@ -114,7 +116,7 @@ class Container:
             )
             create_response.raise_for_status()
             self.container = V1Container.model_validate(create_response.json())
-            print(f"Created container {self.container.metadata.name}")
+            logger.info(f"Created container {self.container.metadata.name}")
         else:
             # If container is found, check if anything has changed
             # Gather the updated fields from the function arguments
@@ -154,11 +156,13 @@ class Container:
 
             if not fields_changed:
                 # Nothing changed—do nothing
-                print(f"No changes detected for container {existing.metadata.name}.")
+                logger.info(
+                    f"No changes detected for container {existing.metadata.name}."
+                )
                 self.container = existing
                 return
 
-            print(
+            logger.info(
                 f"Detected changes for container {existing.metadata.name}, deleting and recreating."
             )
 
@@ -175,7 +179,7 @@ class Container:
                 headers={"Authorization": f"Bearer {self.api_key}"},
             )
             delete_response.raise_for_status()
-            print(f"Deleted container {existing.metadata.name}")
+            logger.info(f"Deleted container {existing.metadata.name}")
 
             # Now recreate the container using the updated parameters
             create_request = V1ContainerRequest(
@@ -204,7 +208,7 @@ class Container:
             )
             create_response.raise_for_status()
             self.container = V1Container.model_validate(create_response.json())
-            print(f"Recreated container {self.container.metadata.name}")
+            logger.info(f"Recreated container {self.container.metadata.name}")
 
         # Save constructor params to `self` for reference, like you do in ReplayBuffer.
         self.kind = "Container"
@@ -242,7 +246,7 @@ class Container:
             headers={"Authorization": f"Bearer {self.api_key}"},
         )
         response.raise_for_status()
-        print(f"Deleted container {self.name} in namespace {self.namespace}")
+        logger.info(f"Deleted container {self.name} in namespace {self.namespace}")
 
     @classmethod
     def get(
@@ -250,6 +254,7 @@ class Container:
         name: Optional[str] = None,
         namespace: Optional[str] = None,
         config: Optional[GlobalConfig] = None,
+        api_key: Optional[str] = None,
     ) -> List[V1Container]:
         """
         Get a list of containers that match the optional name and/or namespace filters.
@@ -258,7 +263,7 @@ class Container:
         current_server = config.get_current_server_config()
         if not current_server:
             raise ValueError("No current server config found")
-        api_key = current_server.api_key
+        api_key = api_key or current_server.api_key
         nebu_host = current_server.server
 
         containers_url = f"{nebu_host}/v1/containers"
@@ -292,6 +297,7 @@ class Container:
         name: str,
         namespace: Optional[str] = None,
         config: Optional[GlobalConfig] = None,
+        api_key: Optional[str] = None,
     ):
         """
         Get a container from the remote server.
@@ -307,7 +313,7 @@ class Container:
         current_server = out.config.get_current_server_config()
         if not current_server:
             raise ValueError("No current server config found")
-        out.api_key = current_server.api_key
+        out.api_key = api_key or current_server.api_key
         out.nebu_host = current_server.server
         out.containers_url = f"{out.nebu_host}/v1/containers"