thestage 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

thestage/services/logging/logging_service.py

@@ -43,9 +43,9 @@ class LoggingService:
 
 
     @error_handler()
-    def print_last_task_logs(self, task_id: int, logs_number: Optional[int]):
+    def print_last_task_logs(self, task_public_id: str, logs_number: Optional[int]):
         logs = self.__thestage_api_client.query_user_logs(
-            task_id=task_id,
+            task_public_id=task_public_id,
             limit=logs_number
         )
         for log_message in reversed(logs.queryResult):
@@ -53,9 +53,9 @@ class LoggingService:
 
 
     @error_handler()
-    def print_last_inference_simulator_logs(self, inference_simulator_id: int, logs_number: Optional[int]):
+    def print_last_inference_simulator_logs(self, inference_simulator_public_id: str, logs_number: Optional[int]):
         logs = self.__thestage_api_client.query_user_logs(
-            inference_simulator_id=inference_simulator_id,
+            inference_simulator_public_id=inference_simulator_public_id,
             limit=logs_number
         )
         for log_message in reversed(logs.queryResult):
@@ -63,9 +63,10 @@ class LoggingService:
 
 
     @error_handler()
-    def print_last_container_logs(self, container_uid: str, logs_number: Optional[int]):
+    def print_last_container_logs(self, container_public_id: Optional[str], container_slug: Optional[str], logs_number: Optional[int]):
         container: Optional[DockerContainerDto] = self.__thestage_api_client.get_container(
-            container_slug=container_uid,
+            container_public_id=container_public_id,
+            container_slug=container_slug,
         )
 
         if not container:
@@ -73,7 +74,7 @@ class LoggingService:
             raise typer.Exit(1)
 
         logs = self.__thestage_api_client.query_user_logs(
-            container_id=container.id,
+            container_public_id=container.public_id,
             limit=logs_number
         )
         for log_message in reversed(logs.queryResult):
@@ -81,15 +82,15 @@ class LoggingService:
 
 
     @error_handler()
-    def stream_task_logs_with_controls(self, task_id: int):
+    def stream_task_logs_with_controls(self, task_public_id: str):
         asyncio.run(
-            self.__stream_task_logs_with_controls_async(task_id=task_id)
+            self.__stream_task_logs_with_controls_async(task_public_id=task_public_id)
         )
 
 
     @error_handler()
-    async def __stream_task_logs_with_controls_async(self, task_id: int):
-        task_view_response: Optional[TaskViewResponse] = self.__thestage_api_client.get_task(task_id=task_id,)
+    async def __stream_task_logs_with_controls_async(self, task_public_id: str):
+        task_view_response: Optional[TaskViewResponse] = self.__thestage_api_client.get_task(task_public_id=task_public_id,)
 
         task_status_map: Dict[str, str] = self.__thestage_api_client.get_task_localized_status_map()
 
@@ -98,25 +99,20 @@ class LoggingService:
         if task:
             if task.frontend_status.status_key not in [TaskStatus.RUNNING, TaskStatus.SCHEDULED]:
                 typer.echo(__("Task must be in status '%required_status%' to stream real-time logs. Task %task_id% status: '%status%'.", {
-                    'task_id': str(task.id),
+                    'task_id': str(task.public_id),
                     'status': task.frontend_status.status_translation,
                     'required_status': task_status_map.get(TaskStatus.RUNNING) or TaskStatus.RUNNING
                 }))
                 raise typer.Exit(1)
         else:
-            typer.echo(__("Task with ID %task_id% was not found", {'task_id': task.id}))
+            typer.echo(f"Task with ID {task_public_id} was not found")
             raise typer.Exit(1)
 
-        typer.echo(__(
-            f"Log stream for task %task_id% started",
-            {
-                'task_id': str(task.id),
-            }
-        ))
+        typer.echo(f"Log stream for task {task.public_id} started")
 
         typer.echo(__("CTRL+C to cancel the task. CTRL+D to disconnect from log stream."))
 
-        print_logs_task = asyncio.create_task(self.print_realtime_logs(task_id=task.id))
+        print_logs_task = asyncio.create_task(self.print_realtime_logs(task_public_id=task.public_id))
         input_task = asyncio.create_task(self.read_log_stream_input())
 
         def sigint_handler():
@@ -131,22 +127,24 @@ class LoggingService:
         if input_task in done:
             print_logs_task.cancel()
             if not input_task.result():  # result is only expected if ctrl+D triggered EOFError
-                typer.echo(f"\rTask {task_id} will be canceled")
+                typer.echo(f"\rTask {task_public_id} will be canceled")
                 self.__thestage_api_client.cancel_task(
-                    task_id=task.id,
+                    task_public_id=task.public_id,
                 )
 
     @error_handler()
-    def stream_inference_simulator_logs_with_controls(self, slug: str):
+    def stream_inference_simulator_logs_with_controls(self, public_id: Optional[str] = None, slug: Optional[str] = None):
         asyncio.run(
             self.__stream_inference_simulator_logs_with_controls_async(
+                public_id=public_id,
                 slug=slug
             )
         )
 
     @error_handler()
-    async def __stream_inference_simulator_logs_with_controls_async(self, slug: str):
+    async def __stream_inference_simulator_logs_with_controls_async(self,  public_id: Optional[str], slug: Optional[str]):
         get_inference_simulator_response: Optional[GetInferenceSimulatorResponse] = self.__thestage_api_client.get_inference_simulator(
+            public_id=public_id,
             slug=slug,
         )
 
@@ -164,20 +162,15 @@ class LoggingService:
                        }))
                 raise typer.Exit(1)
         else:
-            typer.echo(__("Inference simulator with unique ID %slug% was not found", {'slug': inference_simulator.slug}))
+            typer.echo("Inference simulator was not found")
             raise typer.Exit(1)
 
-        typer.echo(__(
-            f"Log stream for inference simulator %slug% started",
-            {
-                'slug': str(inference_simulator.slug),
-            }
-        ))
+        typer.echo(f"Log stream for inference simulator '{inference_simulator.public_id}' started")
 
         typer.echo(__("CTRL+D to disconnect from log stream."))
 
         print_task_or_inference_simulator_logs = asyncio.create_task(
-            self.print_realtime_logs(inference_simulator_id=inference_simulator.id)
+            self.print_realtime_logs(inference_simulator_public_id=inference_simulator.public_id)
         )
         input_task = asyncio.create_task(self.read_log_stream_input())
 
@@ -186,22 +179,25 @@ class LoggingService:
 
         if input_task in done:
             print_task_or_inference_simulator_logs.cancel()
-            typer.echo(__(f"Disconnected from log stream. You can try to reconnect with 'thestage project inference-simulator logs {slug}'."))
+            inference_logs_cmd_id = f"-isn {slug}" if slug else f"-isid {public_id}"
+            typer.echo(f"Disconnected from log stream. You can try to reconnect with 'thestage project inference-simulator logs {inference_logs_cmd_id}'")
 
 
     @error_handler()
-    def stream_container_logs_with_controls(self, container_uid: str):
+    def stream_container_logs_with_controls(self, container_public_id: Optional[str], container_slug: Optional[str]):
         asyncio.run(
             self.__stream_container_logs_with_controls_async(
-                container_uid=container_uid
+                container_public_id=container_public_id,
+                container_slug=container_slug
             )
         )
 
 
     @error_handler()
-    async def __stream_container_logs_with_controls_async(self, container_uid: str):
+    async def __stream_container_logs_with_controls_async(self, container_public_id: Optional[str], container_slug: Optional[str]):
         container: Optional[DockerContainerDto] = self.__thestage_api_client.get_container(
-            container_slug=container_uid,
+            container_public_id=container_public_id,
+            container_slug=container_slug,
         )
 
         if container:
@@ -214,7 +210,7 @@ class LoggingService:
         typer.echo(f"Log stream for Docker container started")
         typer.echo("CTRL+D to disconnect from log stream.")
 
-        print_logs_task = asyncio.create_task(self.print_realtime_logs(docker_container_id=container.id))
+        print_logs_task = asyncio.create_task(self.print_realtime_logs(docker_container_public_id=container.public_id))
         input_task = asyncio.create_task(self.read_log_stream_input())
 
         def sigint_handler():
@@ -243,9 +239,9 @@ class LoggingService:
 
     async def print_realtime_logs(
             self,
-            task_id: Optional[int] = None,
-            inference_simulator_id: Optional[int] = None,
-            docker_container_id: Optional[int] = None,
+            task_public_id: Optional[str] = None,
+            inference_simulator_public_id: Optional[str] = None,
+            docker_container_public_id: Optional[str] = None,
     ):
         polling_interval_seconds: float = 4  # also adjust polling api method timeout if changed
         between_logs_sleeping_coef: float = 1  # we emulate delay between logs, but if for any reason code runs for too long - delays will be controlled with this coef
@@ -269,9 +265,9 @@ class LoggingService:
             #     print_nonblocking(f'TDIFF {stream_to_logs_diff.total_seconds()}', writer)
             try:
                 logs_response = await self.__thestage_api_client.poll_logs_httpx(
-                    task_id=task_id,
-                    inference_simulator_id=inference_simulator_id,
-                    docker_container_id=docker_container_id,
+                    task_public_id=task_public_id,
+                    inference_simulator_public_id=inference_simulator_public_id,
+                    docker_container_public_id=docker_container_public_id,
                     last_log_timestamp=last_iteration_log_timestamp,
                     last_log_id=last_log_id
                 )
@@ -285,6 +281,7 @@ class LoggingService:
                     consecutive_error_count = 0
                     errors_started_at = None
                     log_wait_remaining_limit = 0   # no log delays after reconnect
+                    print_nonblocking("Reconnected to log stream", writer, BytePrintStyle.GREEN)
 
                 last_iteration_log_timestamp = logs_response.lastLogTimestamp
                 last_log_id = logs_response.lastLogId
@@ -314,11 +311,11 @@ class LoggingService:
 
             if consecutive_error_count > 7:
                 seconds_with_error = (datetime.utcnow() - errors_started_at).total_seconds()
-                if inference_simulator_id:
+                if inference_simulator_public_id:
                     print_nonblocking(f"Log stream: disconnected from server (connectivity issues for {seconds_with_error} seconds). Try 'thestage inference-simulator logs <inference-simulator-UID>' to reconnect.", writer)
-                elif task_id:
-                    print_nonblocking(f"Log stream: disconnected from server (connectivity issues for {seconds_with_error} seconds). Try 'thestage project task logs {task_id}' to reconnect.", writer)
-                elif docker_container_id:
+                elif task_public_id:
+                    print_nonblocking(f"Log stream: disconnected from server (connectivity issues for {seconds_with_error} seconds). Try 'thestage project task logs {task_public_id}' to reconnect.", writer)
+                elif docker_container_public_id:
                     print_nonblocking(f"Log stream: disconnected from server (connectivity issues for {seconds_with_error} seconds). Try 'thestage container logs <docker-container-UID>' to reconnect.", writer)
                 else:
                     print_nonblocking(f"Log stream: disconnected from server (connectivity issues for {seconds_with_error} seconds)", writer)

thestage/services/project/dto/inference_simulator_dto.py

@@ -4,20 +4,11 @@ from pydantic import BaseModel, ConfigDict, Field
 class InferenceSimulatorDto(BaseModel):
     model_config = ConfigDict(use_enum_values=True)
 
-    id: Optional[int] = Field(None, alias="id")
-    client_id: Optional[int] = Field(None, alias="clientId")
-    title: Optional[str] = Field(None, alias="title")
+    public_id: Optional[str] = Field(None, alias="publicId")
     slug: Optional[str] = Field(None, alias="slug")
-    docker_container_id: Optional[int] = Field(None, alias="dockerContainerId")
-    instance_rented_id: Optional[int] = Field(None, alias="instanceRentedId")
-    selfhosted_instance_id: Optional[int] = Field(None, alias="selfhostedInstanceId")
-    project_id: Optional[int] = Field(None, alias="projectId")
     status: Optional[str] = Field(None, alias="status")
-    commit_hash: Optional[str] = Field(None, alias="commitHash")
     http_endpoint: Optional[str] = Field(None, alias="httpEndpoint")
     grpc_endpoint: Optional[str] = Field(None, alias="grpcEndpoint")
     metrics_endpoint: Optional[str] = Field(None, alias="metricsEndpoint")
-    inference_metadata: Optional[Dict[str, Any]] = Field(None, alias="inferenceMetadata")
     qlip_serve_metadata: Optional[Dict[str, Any]] = Field(None, alias="qlipServeMetadata")
     created_at: Optional[str] = Field(None, alias="createdAt")
-    updated_at: Optional[str] = Field(None, alias="updatedAt")

thestage/services/project/dto/inference_simulator_model_dto.py

@@ -4,18 +4,10 @@ from pydantic import BaseModel, ConfigDict, Field
 class InferenceSimulatorModelDto(BaseModel):
     model_config = ConfigDict(use_enum_values=True)
 
-    id: Optional[int] = Field(None, alias='id')
+    public_id: Optional[str] = Field(None, alias='publicId')
     slug: Optional[str] = Field(None, alias='slug')
-    client_id: Optional[int] = Field(None, alias='clientId')
-    instance_rented_id: Optional[int] = Field(None, alias='instanceRentedId')
-    selfhosted_instance_id: Optional[int] = Field(None, alias='selfhostedInstanceId')
-    project_id: Optional[int] = Field(None, alias='projectId')
     status: Optional[str] = Field(None, alias='status')
     environment_metadata: Optional[Dict[str, Any]] = Field(None, alias='environmentMetadata')
     commit_hash: Optional[str] = Field(None, alias='commitHash')
-    cpu_architecture: Optional[str] = Field(None, alias='cpuArchitecture')
-    gpu_model: Optional[str] = Field(None, alias='gpuModel')
-    ecr_image_url: Optional[str] = Field(None, alias='ecrImageUrl')
-    s3_artifacts_url: Optional[str] = Field(None, alias='s3ArtifactsUrl')
     created_at: Optional[str] = Field(None, alias='createdAt')
-    updated_at: Optional[str] = Field(None, alias='updatedAt')
+    updated_at: Optional[str] = Field(None, alias='updatedAt')

thestage/services/project/dto/project_config.py

@@ -6,9 +6,9 @@ from pydantic import Field, ConfigDict, BaseModel
 class ProjectConfig(BaseModel):
     model_config = ConfigDict(use_enum_values=True)
 
-    id: int = Field(None, alias='id')
     slug: str = Field(None, alias='slug')
+    public_id: str = Field(None, alias='public_id')
     git_repository_url: str = Field(None, alias='git_repository_url')
     deploy_key_path: str = Field(None, alias='deploy_key_path')
-    default_container_uid: Optional[str] = Field(None, alias='default_container_uid')
+    default_container_public_id: Optional[str] = Field(None, alias='default_container_public_id')
     prompt_for_default_container: bool = Field(True, alias='prompt_for_default_container')

thestage/services/project/mapper/project_inference_simulator_mapper.py

@@ -12,6 +12,7 @@ class ProjectInferenceSimulatorMapper(AbstractMapper):
             return None
 
         return ProjectInferenceSimulatorEntity(
+            public_id=item.public_id or '',
             slug=item.slug or '',
             status=item.status or '',
             http_endpoint=item.http_endpoint or '',

thestage/services/project/mapper/project_inference_simulator_model_mapper.py

@@ -11,11 +11,11 @@ class ProjectInferenceSimulatorModelMapper(AbstractMapper):
             return None
 
         return ProjectInferenceSimulatorModelEntity(
-            id=item.id,
+            public_id=item.public_id,
             slug=item.slug,
             status=item.status or '',
             commit_hash=item.commit_hash or '',
             environment_metadata=item.environment_metadata or {},
             started_at=item.created_at or '',
-            finished_at=item.updated_at or ''
+            finished_at=item.updated_at or ''  # TODO updated_at cannot be finished_at
         )

thestage/services/project/mapper/project_task_mapper.py

@@ -12,11 +12,10 @@ class ProjectTaskMapper(AbstractMapper):
             return None
 
         return ProjectTaskEntity(
-            id=item.id or '',
+            public_id=item.public_id or '',
             title=item.title or '',
             status=item.frontend_status.status_translation or '',
-            docker_container_id=item.docker_container_id or '',
-            docker_container_slug=(str(item.docker_container.slug) or '') if item.docker_container else '',
+            docker_container_public_id=item.docker_container_public_id,
             started_at=item.started_at or '',
             finished_at=item.finished_at or '',
         )