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

thestage/entities/container.py

@@ -10,8 +10,10 @@ class DockerContainerEntity(BaseModel):
         use_enum_values=True,
     )
 
-    slug: Optional[str] = Field(None, alias='UNIQUE ID')
+    public_id: Optional[str] = Field(None, alias='ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
-    title: Optional[str] = Field(None, alias='TITLE')
+    project_slug: Optional[str] = Field(None, alias='PROJECT NAME')
     instance_type: Optional[str] = Field(None, alias='INSTANCE TYPE')
-    instance_slug: Optional[str] = Field(None, alias='INSTANCE UNIQUE ID')
+    instance_slug: Optional[str] = Field(None, alias='INSTANCE NAME')
+    docker_image: Optional[str] = Field(None, alias='DOCKER IMAGE')

thestage/entities/project_inference_simulator.py

@@ -10,7 +10,8 @@ class ProjectInferenceSimulatorEntity(BaseModel):
         use_enum_values=True,
     )
 
-    slug: Optional[str] = Field(None, alias='UNIQUE ID')
+    public_id: Optional[str] = Field(None, alias='ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
     http_endpoint: Optional[str] = Field(None, alias="HTTP")
     grpc_endpoint: Optional[str] = Field(None, alias="GRPC")

thestage/entities/project_inference_simulator_model.py

@@ -10,8 +10,8 @@ class ProjectInferenceSimulatorModelEntity(BaseModel):
         use_enum_values=True,
     )
 
-    id: Optional[int] = Field(None, alias='ID')
-    slug: Optional[str] = Field(None, alias='UNIQUE_ID')
+    public_id: Optional[str] = Field(None, alias='ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
     commit_hash: Optional[str] = Field(None, alias='COMMIT_HASH')
     environment_metadata: Optional[Dict[str, Any]] = Field(None, alias='ENVIRONMENT_METADATA')

thestage/entities/project_task.py

@@ -10,10 +10,9 @@ class ProjectTaskEntity(BaseModel):
         use_enum_values=True,
     )
 
-    id: Optional[int] = Field(None, alias='ID')
+    public_id: Optional[str] = Field(None, alias='ID')
     title: Optional[str] = Field(None, alias='TITLE')
     status: Optional[str] = Field(None, alias='STATUS')
-    docker_container_id: Optional[int] = Field(None, alias='DOCKER_CONTAINER_ID')
-    docker_container_slug: Optional[str] = Field(None, alias='DOCKER_CONTAINER_UID')
+    docker_container_public_id: Optional[str] = Field(None, alias='CONTAINER ID')
     started_at: Optional[str] = Field(None, alias='STARTED AT')
     finished_at: Optional[str] = Field(None, alias='FINISHED_AT')

thestage/entities/rented_instance.py

@@ -10,9 +10,9 @@ class RentedInstanceEntity(BaseModel):
         use_enum_values=True
     )
 
+    public_id: Optional[str] = Field(None, alias='ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
-    title: Optional[str] = Field(None, alias='TITLE')
-    slug: Optional[str] = Field(None, alias='UNIQUE ID')
     cpu_type: Optional[str] = Field(None, alias='CPU TYPE')
     cpu_cores: Optional[str] = Field(None, alias='CPU CORES')
     gpu_type: Optional[str] = Field(None, alias='GPU TYPE')

thestage/entities/self_hosted_instance.py

@@ -9,9 +9,9 @@ class SelfHostedInstanceEntity(BaseModel):
         populate_by_name=True,
     )
 
+    public_id: Optional[str] = Field(None, alias='ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
-    title: Optional[str] = Field(None, alias='TITLE')
-    slug: Optional[str] = Field(None, alias='SLUG')
     cpu_type: Optional[str] = Field(str, alias='CPU_TYPE')
     cpu_cores: Optional[int] = Field(None, alias='CPU_CORES')
     gpu_type: Optional[str] = Field(str, alias='GPU_TYPE')

thestage/helpers/error_handler.py

@@ -75,7 +75,7 @@ def error_handler() -> Callable:
                 app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except GitCommandError as e7:
-                typer.echo(f'Git command error encountered: {e7.stderr} (status: {e7.status})')
+                typer.echo(f'Git command error encountered: {e7.stdout} \n {e7.stderr} (status: {e7.status})')
                 app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except RemoteServerException as e8:

thestage/main.py

@@ -19,7 +19,7 @@ def main():
             config_provider.update_allowed_commands_and_is_token_valid(validate_token_response=token_info)
         except Exception as e:
             app_logger.error(f'{traceback.format_exc()}')
-            print('Unexpected error occurred')  # TODO inquire what we want here if backend is offline
+            print('Error connecting to TheStage servers')  # TODO inquire what we want here if backend is offline
             print(f'Application logs path: {str(get_log_path_from_os())}')
             return
 

thestage/services/clients/git/git_client.py

@@ -196,7 +196,7 @@ class GitLocalClient:
     ) -> Optional[str]:
         repo = self.__get_repo(path=path)
         if repo.head.is_detached:
-            line_color = ColorScheme.GIT_HEADLESS
+            line_color = ColorScheme.GIT_HEADLESS.value
             print(f'[{line_color}]Committing in detached head state at {repo.head.commit.hexsha}[/{line_color}]')
         commit_name = name if name else f"Auto commit {str(datetime.datetime.now().date())}"
         commit = repo.git.commit('--allow-empty', '-m', commit_name, )