nebu 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

nebu/containers/container.py

@@ -10,6 +10,7 @@ from nebu.containers.models import (
     V1ContainerRequest,
     V1ContainerResources,
     V1Containers,
+    V1ContainerSearch,
     V1EnvVar,
     V1Meter,
     V1PortRequest,
@@ -23,9 +24,9 @@ class Container:
     def __init__(
         self,
         name: str,
+        image: str,
         namespace: str = "default",
         platform: Optional[str] = None,
-        image: str = "",
         env: Optional[List[V1EnvVar]] = None,
         command: Optional[str] = None,
         volumes: Optional[List[V1VolumePath]] = None,
@@ -48,6 +49,7 @@ class Container:
             raise ValueError("No current server config found")
         self.api_key = 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}")
@@ -240,3 +242,123 @@ class Container:
         )
         response.raise_for_status()
         print(f"Deleted container {self.name} in namespace {self.namespace}")
+
+    @classmethod
+    def get(
+        cls,
+        name: Optional[str] = None,
+        namespace: Optional[str] = None,
+        config: Optional[GlobalConfig] = None,
+    ) -> List[V1Container]:
+        """
+        Get a list of containers that match the optional name and/or namespace filters.
+        """
+        config = config or GlobalConfig.read()
+        current_server = config.get_current_server_config()
+        if not current_server:
+            raise ValueError("No current server config found")
+        api_key = current_server.api_key
+        nebu_host = current_server.server
+
+        containers_url = f"{nebu_host}/v1/containers"
+
+        response = requests.get(
+            containers_url, headers={"Authorization": f"Bearer {api_key}"}
+        )
+        response.raise_for_status()
+
+        containers_response = V1Containers.model_validate(response.json())
+        filtered_containers = containers_response.containers
+
+        if name:
+            filtered_containers = [
+                container
+                for container in filtered_containers
+                if container.metadata.name == name
+            ]
+        if namespace:
+            filtered_containers = [
+                container
+                for container in filtered_containers
+                if container.metadata.namespace == namespace
+            ]
+
+        return filtered_containers
+
+    @classmethod
+    def load(
+        cls,
+        name: str,
+        namespace: str = "default",
+        config: Optional[GlobalConfig] = None,
+    ):
+        """
+        Get a container from the remote server.
+        """
+        containers = cls.get(namespace=namespace, name=name, config=config)
+        if not containers:
+            raise ValueError("Container not found")
+        container_v1 = containers[0]
+
+        out = cls.__new__(cls)
+        out.container = container_v1
+        out.config = config or GlobalConfig.read()
+        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.nebu_host = current_server.server
+        out.containers_url = f"{out.nebu_host}/v1/containers"
+
+        out = cls.from_v1(container_v1)
+        return out
+
+    @classmethod
+    def from_v1(cls, v1: V1Container) -> "Container":
+        out = cls.__new__(cls)
+        out.name = v1.metadata.name
+        out.namespace = v1.metadata.namespace
+        out.status = v1.status
+        out.kind = v1.kind
+        out.platform = v1.platform
+        out.metadata = v1.metadata
+        out.image = v1.image
+        out.env = v1.env
+        out.command = v1.command
+        out.volumes = v1.volumes
+        out.accelerators = v1.accelerators
+        out.resources = v1.resources
+        out.meters = v1.meters
+        out.restart = v1.restart
+        out.queue = v1.queue
+        out.timeout = v1.timeout
+        out.ssh_keys = v1.ssh_keys
+        return out
+
+    @classmethod
+    def search(
+        cls,
+        params: V1ContainerSearch,
+        config: Optional[GlobalConfig] = None,
+    ) -> List[V1Container]:
+        """
+        Search for containers on the remote server.
+        """
+        config = config or GlobalConfig.read()
+        current_server = config.get_current_server_config()
+        if not current_server:
+            raise ValueError("No current server config found")
+        api_key = current_server.api_key
+        nebu_host = current_server.server
+
+        search_url = f"{nebu_host}/v1/containers/search"
+
+        response = requests.post(
+            search_url,
+            headers={"Authorization": f"Bearer {api_key}"},
+            json=params.model_dump(),
+        )
+        response.raise_for_status()
+
+        containers_response = V1Containers.model_validate(response.json())
+        return containers_response.containers

nebu/containers/models.py

@@ -116,6 +116,16 @@ class V1AuthzConfig(BaseModel):
     rules: Optional[List[V1AuthzRule]] = None
 
 
+class V1ContainerHealthCheck(BaseModel):
+    interval: Optional[str] = None
+    timeout: Optional[str] = None
+    retries: Optional[int] = None
+    start_period: Optional[str] = None
+    path: Optional[str] = None
+    port: Optional[int] = None
+    protocol: Optional[str] = None
+
+
 class V1PortRequest(BaseModel):
     port: int
     protocol: Optional[str] = None
@@ -146,6 +156,7 @@ class V1ContainerRequest(BaseModel):
     ports: Optional[List[V1PortRequest]] = None
     proxy_port: Optional[int] = None
     authz: Optional[V1AuthzConfig] = None
+    health_check: Optional[V1ContainerHealthCheck] = None
 
     model_config = ConfigDict(use_enum_values=True)
 
@@ -169,6 +180,7 @@ class V1Container(BaseModel):
     ports: Optional[List[V1Port]] = None
     proxy_port: Optional[int] = None
     authz: Optional[V1AuthzConfig] = None
+    health_check: Optional[V1ContainerHealthCheck] = None
 
     model_config = ConfigDict(use_enum_values=True)
 
@@ -189,6 +201,9 @@ class V1UpdateContainer(BaseModel):
     timeout: Optional[str] = None
     resources: Optional[V1ContainerResources] = None
     proxy_port: Optional[int] = None
+    authz: Optional[V1AuthzConfig] = None
+    health_check: Optional[V1ContainerHealthCheck] = None
+    no_delete: Optional[bool] = None
 
     model_config = ConfigDict(use_enum_values=True)
 
@@ -197,3 +212,27 @@ class V1Containers(BaseModel):
     containers: List[V1Container]
 
     model_config = ConfigDict(use_enum_values=True)
+
+
+class V1ContainerSearch(BaseModel):
+    namespace: Optional[str] = None
+    image: Optional[str] = None
+    env: Optional[List[V1EnvVar]] = None
+    command: Optional[str] = None
+    args: Optional[str] = None
+    volumes: Optional[List[V1VolumePath]] = None
+    accelerators: Optional[List[str]] = None
+    labels: Optional[Dict[str, str]] = None
+    cpu_request: Optional[str] = None
+    memory_request: Optional[str] = None
+    platform: Optional[str] = None
+    health_check: Optional[V1ContainerHealthCheck] = None
+    meters: Optional[List[V1Meter]] = None
+    restart: Optional[str] = None
+    queue: Optional[str] = None
+    timeout: Optional[str] = None
+    resources: Optional[V1ContainerResources] = None
+    proxy_port: Optional[int] = None
+    authz: Optional[V1AuthzConfig] = None
+
+    model_config = ConfigDict(use_enum_values=True)

{nebu-0.1.2.dist-info → nebu-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nebu
-Version: 0.1.2
+Version: 0.1.4
 Summary: A globally distributed container runtime
 Requires-Python: >=3.10.14
 Description-Content-Type: text/markdown

{nebu-0.1.2.dist-info → nebu-0.1.4.dist-info}/RECORD

@@ -1,16 +1,16 @@
 nebu/__init__.py,sha256=EbdC8ZKnRTt6jkX0WN0p1pnaDEzb2InqZ1r8QZWzph0,195
 nebu/config.py,sha256=XBY7uKgcJX9d1HGxqqpx87o_9DuF3maUlUnKkcpUrKU,4565
 nebu/meta.py,sha256=AnvrtP0mc7a-YP4zVhErHPsU0FSmwMejYgKWnV8wqqE,566
-nebu/containers/container.py,sha256=WCXBadAHhvkFQdpDjHu7nh6NjLlMxRsJbMbLXH8zaCs,9283
+nebu/containers/container.py,sha256=sCi96l5CJ-wt0xf0ELjXN1MOTljzCzJ-qN-xgYs7Pw0,13217
 nebu/containers/decorator.py,sha256=sZQ4ZwqQk_jLDJ-n9P6N0MlxvWL9Ac7eCPIHVxYq58c,5576
-nebu/containers/models.py,sha256=a_WsgnesjioRVspO8jZcWPbpFUJTU33Ep-kCyXwFDPQ,5397
+nebu/containers/models.py,sha256=_d6BS6puoVWvyHhWX-74WFHJSOE8WJaFt2zGMTm9EEA,6782
 nebu/containers/server.py,sha256=yFa2Y9PzBn59E1HftKiv0iapPonli2rbGAiU6r-wwe0,2513
 nebu/processors/models.py,sha256=6XSw4iM77XYJf6utm8QReN9fyMS0dK40a5sVwsC7RRA,1970
 nebu/processors/processor.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.2.dist-info/METADATA,sha256=eDNSR35X243_eA6nAsIjVQ2JrjEcX-Yd4lTIGaMIYzM,1587
-nebu-0.1.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.2.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.2.dist-info/RECORD,,
+nebu-0.1.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.4.dist-info/METADATA,sha256=bfMCjbLisYyBt-JXZT1Bu9MS2aLePTjz1cWjcxpPKqc,1587
+nebu-0.1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.4.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.4.dist-info/RECORD,,