thestage 0.6.4__py3-none-any.whl → 0.6.6__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,7 +10,7 @@ class ProjectInferenceSimulatorModelEntity(BaseModel):
         use_enum_values=True,
     )
 
-    id: Optional[int] = Field(None, alias='ID')
+    public_id: Optional[str] = Field(None, alias='ID')
     slug: Optional[str] = Field(None, alias='UNIQUE_ID')
     status: Optional[str] = Field(None, alias='STATUS')
     commit_hash: Optional[str] = Field(None, alias='COMMIT_HASH')

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:
@@ -106,8 +106,8 @@ def error_handler() -> Callable:
                     raise e100
                 else:
                     typer.echo(__('Undefined error occurred'))
-                    # typer.echo(e100.__class__.__name__)
-                    # print(traceback.format_exc())
+                    typer.echo(e100.__class__.__name__)
+                    print(traceback.format_exc())
                     # TODO send all exceptions to backend?
                     app_logger.error(f'{traceback.format_exc()}')
                     raise typer.Exit(1)

thestage/services/clients/git/git_client.py

@@ -71,9 +71,11 @@ class GitLocalClient:
     ) -> Optional[Repo]:
 
         repo = git.Repo.init(path)
-        if repo:
-            # default git name master, rename to main - sync wih github
-            repo.git.branch("-M", self.__base_name_local)
+
+        # if repo:
+        #     #default git name master, rename to main - sync wih github
+        #     repo.git.branch("-M", self.__base_name_local)
+
         return repo
 
     def add_remote_to_repo(
@@ -131,15 +133,9 @@ class GitLocalClient:
             origin = repo.remote(self.__base_name_remote)
 
             if origin:
-                progress = ProgressPrinter()
-                try:
-                    origin.pull(refspec=local_branch, progress=progress)
-                    typer.echo(f"Pulled remote changes to branch '{local_branch}'")
-                except GitCommandError as ex:
-                    for line in progress.allDroppedLines():
-                        # returning the whole output if failed - so that user have any idea what's going on
-                        print(f'>> {line}')
-                    raise ex
+                repo.git.pull('origin', local_branch)
+                typer.echo(f"Pulled remote changes to branch '{local_branch}'")
+
 
     def find_main_branch_name(self, path: str) -> Optional[str]:
         repo = self.__get_repo(path=path)