thestage 0.5.44__tar.gz → 0.5.45__tar.gz

{thestage-0.5.44 → thestage-0.5.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: thestage
-Version: 0.5.44
+Version: 0.5.45
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai
@@ -21,7 +21,7 @@ Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-gettext-translations (>=1.1.0,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: typer[all] (>=0.9.0,<0.10.0)
+Requires-Dist: typer[all] (>=0.15.2,<0.16.0)
 Description-Content-Type: text/markdown
 
 # Introduction

{thestage-0.5.44 → thestage-0.5.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "thestage"
-version = "0.5.44"
+version = "0.5.45"
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]
 readme = "README.md"
@@ -20,7 +20,7 @@ exclude = [
 
 [tool.poetry.dependencies]
 python = ">=3.9,<=3.13"
-typer = {extras = ["all"], version = "^0.9.0"}
+typer = {extras = ["all"], version = "^0.15.2"}
 tabulate = "^0.9.0"
 python-dotenv = "^1.0.0"
 pydantic = "^2.4.2"

{thestage-0.5.44 → thestage-0.5.45}/thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.44"
+__version__ = "0.5.45"

{thestage-0.5.44 → thestage-0.5.45}/thestage/controllers/container_controller.py

@@ -3,13 +3,10 @@ import re
 from pathlib import Path
 from typing import Optional, List
 
-from thestage.entities.container import DockerContainerEntity
 from thestage.services.clients.thestage_api.dtos.enums.container_pending_action import DockerContainerAction
 from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
 from thestage.i18n.translation import __
-from thestage.services.clients.thestage_api.dtos.enums.container_status import DockerContainerStatus
 from thestage.services.container.container_service import ContainerService
-from thestage.services.container.mapper.container_mapper import ContainerMapper
 from thestage.helpers.logger.app_logger import app_logger
 from thestage.controllers.utils_controller import validate_config_and_get_service_factory, get_current_directory
 

{thestage-0.5.44 → thestage-0.5.45}/thestage/controllers/instance_controller.py

@@ -57,46 +57,12 @@ def rented_list(
     config = service_factory.get_config_provider().get_full_config()
 
     instance_service: InstanceService = service_factory.get_instance_service()
-    instance_rented_status_map = service_factory.get_thestage_api_client().get_rented_business_status_map(config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: instance_rented_status_map[key] for key in [
-            InstanceRentedBusinessStatus.ONLINE,
-            InstanceRentedBusinessStatus.CREATING,
-            InstanceRentedBusinessStatus.TERMINATING,
-            InstanceRentedBusinessStatus.REBOOTING,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = instance_rented_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in instance_rented_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(instance_rented_status_map.values()))
-            }))
-            raise typer.Exit(1)
-
-    typer.echo(__(
-        "Listing rented server instances with the following statuses: %statuses%, to view all rented server instances, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in instance_rented_status_map.items() if value in statuses]
-
-    instance_service.print(
-        func_get_data=instance_service.get_rented_list,
-        func_special_params={
-            'statuses': backend_statuses,
-        },
-        mapper=InstanceMapper(),
+
+    instance_service.print_rented_instance_list(
         config=config,
-        headers=list(map(lambda x: x.alias, RentedInstanceEntity.model_fields.values())),
+        statuses=statuses,
         row=row,
-        page=page,
-        show_index="never",
+        page=page
     )
 
     typer.echo(__("Rented server instances listing complete"))
@@ -175,45 +141,12 @@ def self_hosted_list(
     config = service_factory.get_config_provider().get_full_config()
 
     instance_service: InstanceService = service_factory.get_instance_service()
-    selfhosted_instance_status_map = service_factory.get_thestage_api_client().get_selfhosted_business_status_map(config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: selfhosted_instance_status_map[key] for key in [
-            SelfhostedBusinessStatus.AWAITING_CONFIGURATION,
-            SelfhostedBusinessStatus.RUNNING,
-            SelfhostedBusinessStatus.TERMINATED,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = selfhosted_instance_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in selfhosted_instance_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(selfhosted_instance_status_map.values()))
-            }))
-            raise typer.Exit(1)
-
-    typer.echo(__(
-        "Listing self-hosted instances with the following statuses: %statuses%, to view all self-hosted instances, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in selfhosted_instance_status_map.items() if value in statuses]
-
-    instance_service.print(
-        func_get_data=instance_service.get_self_hosted_list,
-        func_special_params={
-            'statuses': backend_statuses,
-        },
-        mapper=SelfHostedMapper(),
+
+    instance_service.print_self_hosted_instance_list(
         config=config,
-        headers=list(map(lambda x: x.alias, SelfHostedInstanceEntity.model_fields.values())),
+        statuses=statuses,
         row=row,
-        page=page,
-        show_index="never",
+        page=page
     )
 
     typer.echo(__("Self-hosted instances listing complete"))

{thestage-0.5.44 → thestage-0.5.45}/thestage/controllers/project_controller.py

@@ -236,29 +236,9 @@ def list_runs(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
 
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    project_service.print(
-        func_get_data=project_service.get_project_task_list,
-        func_special_params={
-            'project_slug': project_uid,
-        },
-        mapper=ProjectTaskMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectTaskEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_task_list(config, project_uid, row, page)
 
     typer.echo(__("Tasks listing complete"))
     raise typer.Exit(0)
@@ -664,58 +644,9 @@ def list_inference_simulators(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    inference_simulator_status_map = service_factory.get_thestage_api_client().get_inference_simulator_business_status_map(
-        config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: inference_simulator_status_map[key] for key in [
-            InferenceSimulatorStatus.SCHEDULED,
-            InferenceSimulatorStatus.CREATING,
-            InferenceSimulatorStatus.RUNNING,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = inference_simulator_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in inference_simulator_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(inference_simulator_status_map.values()))
-            }))
-            raise typer.Exit(1)
 
-    typer.echo(__(
-        "Listing inference simulators with the following statuses: %statuses%, to view all inference simulators, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in inference_simulator_status_map.items() if value in statuses]
-
-    project_service.print(
-        func_get_data=project_service.get_project_inference_simulator_list,
-        func_special_params={
-            'project_slug': project_uid,
-            'statuses': backend_statuses,
-        },
-        mapper=ProjectInferenceSimulatorMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_inference_simulator_list(config, project_uid, statuses, row, page)
 
     typer.echo(__("Inference simulators listing complete"))
     raise typer.Exit(0)
@@ -753,58 +684,9 @@ def list_inference_simulator_models(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    inference_simulator_model_status_map = service_factory.get_thestage_api_client().get_inference_simulator_model_business_status_map(
-        config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: inference_simulator_model_status_map[key] for key in [
-            InferenceModelStatus.SCHEDULED,
-            InferenceModelStatus.PROCESSING,
-            InferenceModelStatus.PUSH_SUCCEED,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = inference_simulator_model_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in inference_simulator_model_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(inference_simulator_model_status_map.values()))
-            }))
-            raise typer.Exit(1)
 
-    typer.echo(__(
-        "Listing inference simulator models with the following statuses: %statuses%, to view all inference simulator models, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in inference_simulator_model_status_map.items() if value in statuses]
-
-    project_service.print(
-        func_get_data=project_service.get_project_inference_simulator_model_list,
-        func_special_params={
-            'project_slug': project_uid,
-            'statuses': backend_statuses,
-        },
-        mapper=ProjectInferenceSimulatorModelMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorModelEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_inference_simulator_model_list(config, project_uid, statuses, row, page)
 
     typer.echo(__("Inference simulator models listing complete"))
     raise typer.Exit(0)

{thestage-0.5.44 → thestage-0.5.45}/thestage/main.py

@@ -1,3 +1,8 @@
+from thestage.services.core_files.config_entity import ConfigEntity
+
+# TODO use this in config_provider
+initial_config: ConfigEntity = ConfigEntity()
+
 def main():
     try:
         import warnings
@@ -8,9 +13,9 @@ def main():
         from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
             config_controller
 
+        base_controller.app.add_typer(project_controller.app, name="project")
         base_controller.app.add_typer(container_controller.app, name="container")
         base_controller.app.add_typer(instance_controller.app, name="instance")
-        base_controller.app.add_typer(project_controller.app, name="project")
         base_controller.app.add_typer(config_controller.app, name="config")
 
         import thestage.config

{thestage-0.5.44 → thestage-0.5.45}/thestage/services/clients/git/git_client.py

@@ -13,7 +13,7 @@ from thestage.color_scheme.color_scheme import ColorScheme
 from thestage.config import THESTAGE_CONFIG_DIR
 from thestage.exceptions.git_access_exception import GitAccessException
 from thestage.git.ProgressPrinter import ProgressPrinter
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 
 
 class GitLocalClient:
@@ -27,7 +27,7 @@ class GitLocalClient:
 
     def __init__(
             self,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
     ):
         self.__file_system_service = file_system_service
 

{thestage-0.5.44 → thestage-0.5.45}/thestage/services/clients/thestage_api/api_client.py

@@ -85,12 +85,11 @@ from thestage.services.clients.thestage_api.dtos.task_controller.task_list_for_p
 from thestage.services.clients.thestage_api.dtos.task_controller.task_status_localized_map_response import \
     TaskStatusLocalizedMapResponse
 from thestage.services.clients.thestage_api.dtos.task_controller.task_view_response import TaskViewResponse
-from thestage.services.clients.thestage_api.dtos.user_profile import UserProfileResponse
 from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedListResponse, \
     InstanceRentedDto, InstanceRentedItemResponse, InstanceRentedBusinessStatusMapperResponse
 
-from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse, \
-    TheStageBasePaginatedResponse
+from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
+from thestage.services.clients.thestage_api.dtos.user_controller.user_profile import UserProfileResponse
 from thestage.services.project.dto.inference_simulator_dto import InferenceSimulatorDto
 from thestage.services.project.dto.inference_simulator_model_dto import InferenceSimulatorModelDto
 from thestage.services.task.dto.task_dto import TaskDto
@@ -146,7 +145,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = TaskListForProjectResponse.model_validate(response) if response else None
         return result.tasks if result and result.is_success else None
 
-
     def get_inference_simulator_list_for_project(
             self,
             token: str,
@@ -203,7 +201,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = InferenceSimulatorModelListForProjectResponse.model_validate(response) if response else None
         return result.inferenceSimulatorModels if result and result.is_success else None
 
-
     def get_rented_instance_list(
             self,
             token: str,
@@ -260,7 +257,7 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return data.taskStatusMap if data else None
 
-    def get_rented_item(
+    def get_rented_instance(
             self,
             token: str,
             instance_slug: Optional[str] = None,
@@ -282,7 +279,7 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return InstanceRentedItemResponse.model_validate(response).instance_rented if response else None
 
-    def get_selfhosted_item(
+    def get_selfhosted_instance(
             self,
             token: str,
             instance_slug: Optional[str] = None,
@@ -347,19 +344,6 @@ class TheStageApiClient(TheStageApiClientCore):
         data = SelfHostedRentedRentedBusinessStatusMapperResponse.model_validate(response) if response else None
         return data.selfhosted_instance_business_status_map if data else None
 
-    def get_profile(
-            self,
-            token: str,
-    ) -> Optional[UserProfileResponse]:
-
-        response = self._request(
-            method='GET',
-            url='/frontend-api/user/my-profile',
-            token=token,
-        )
-
-        result = UserProfileResponse.model_validate(response) if response else None
-        return result if result else None
 
     def cancel_task(
             self,
@@ -521,8 +505,9 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectRunTaskResponse.model_validate(response) if response else None
 
-
-    async def poll_logs_httpx(self, token: str, docker_container_id: Optional[int], last_log_timestamp: str, last_log_id: str, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None) -> Optional[LogPollingResponse]:
+    async def poll_logs_httpx(self, token: str, docker_container_id: Optional[int], last_log_timestamp: str,
+                              last_log_id: str, task_id: Optional[int] = None,
+                              inference_simulator_id: Optional[int] = None) -> Optional[LogPollingResponse]:
         request_headers = {'Content-Type': 'application/json'}
         if token: request_headers['Authorization'] = f"Bearer {token}"
 
@@ -544,7 +529,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
             return LogPollingResponse.model_validate(response.json()) if response else None
 
-
     def add_public_ssh_key_to_user(self, token: str, public_key: str, note: str) -> AddSshKeyToUserResponse:
         request = AddSshKeyToUserRequest(
             sshKey=public_key,
@@ -561,7 +545,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = AddSshKeyToUserResponse.model_validate(response) if response else None
         return result
 
-
     def is_user_has_ssh_public_key(self, token: str, public_key: str) -> IsUserHasSshPublicKeyResponse:
         request = IsUserHasSshPublicKeyRequest(
             sshKey=public_key,
@@ -577,8 +560,8 @@ class TheStageApiClient(TheStageApiClientCore):
         result = IsUserHasSshPublicKeyResponse.model_validate(response) if response else None
         return result
 
-
-    def add_public_ssh_key_to_instance_rented(self, token: str, instance_rented_id: int, ssh_key_pair_id: int) -> AddSshPublicKeyToInstanceResponse:
+    def add_public_ssh_key_to_instance_rented(self, token: str, instance_rented_id: int,
+                                              ssh_key_pair_id: int) -> AddSshPublicKeyToInstanceResponse:
         request = AddSshPublicKeyToInstanceRequest(
             instanceRentedId=instance_rented_id,
             sshPublicKeyId=ssh_key_pair_id,
@@ -594,7 +577,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = AddSshPublicKeyToInstanceResponse.model_validate(response) if response else None
         return result
 
-
     def start_project_inference_simulator(
             self,
             token: str,
@@ -625,7 +607,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectStartInferenceSimulatorResponse.model_validate(response) if response else None
 
-
     def push_project_inference_simulator_model(
             self,
             token: str,
@@ -644,7 +625,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectPushInferenceSimulatorModelResponse.model_validate(response) if response else None
 
-
     def get_inference_simulator_business_status_map(self, token: str, ) -> Optional[Dict[str, str]]:
         response = self._request(
             method='POST',
@@ -657,7 +637,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return data.inference_simulator_status_map if data else None
 
-
     def get_inference_simulator_model_business_status_map(self, token: str, ) -> Optional[Dict[str, str]]:
         response = self._request(
             method='POST',
@@ -688,7 +667,6 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return GetInferenceSimulatorResponse.model_validate(response) if response else None
 
-
     @error_handler()
     def deploy_inference_model_to_instance(
             self,
@@ -702,8 +680,8 @@ class TheStageApiClient(TheStageApiClientCore):
         request = DeployInferenceModelToInstanceRequest(
             inferenceSimulatorSlug=unique_id_with_timestamp,
             modelSlug=unique_id,
-            instanceRentedSlug = rented_instance_unique_id,
-            selfhostedInstanceSlug = self_hosted_instance_unique_id
+            instanceRentedSlug=rented_instance_unique_id,
+            selfhostedInstanceSlug=self_hosted_instance_unique_id
         )
 
         response = self._request(
@@ -714,7 +692,6 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return DeployInferenceModelToInstanceResponse.model_validate(response) if response else None
 
-
     @error_handler()
     def deploy_inference_model_to_sagemaker(
             self,
@@ -735,8 +712,9 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return DeployInferenceModelToSagemakerResponse.model_validate(response) if response else None
 
-
-    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None, container_id: Optional[int] = None) -> UserLogsQueryResponse:
+    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None,
+                        inference_simulator_id: Optional[int] = None,
+                        container_id: Optional[int] = None) -> UserLogsQueryResponse:
         request = UserLogsQueryRequest(
             inferenceSimulatorId=inference_simulator_id,
             taskId=task_id,
@@ -753,4 +731,4 @@ class TheStageApiClient(TheStageApiClientCore):
         )
 
         result = UserLogsQueryResponse.model_validate(response) if response else None
-        return result
+        return result

{thestage-0.5.44/thestage/services/clients/thestage_api/dtos → thestage-0.5.45/thestage/services/clients/thestage_api/dtos/user_controller}/user_profile.py

@@ -3,7 +3,10 @@ from typing import Optional
 from pydantic import BaseModel, Field
 
 
-class UserProfileResponse(BaseModel):
-    name: Optional[str] = Field(None, alias='name')
+class UserProfile(BaseModel):
     email: Optional[str] = Field(None, alias='email')
-    metamask_wallet: Optional[str] = Field(None, alias='metamaskWallet')
+
+
+
+class UserProfileResponse(BaseModel):
+    userProfile: Optional[UserProfile] = Field(None, alias='userProfile')

{thestage-0.5.44 → thestage-0.5.45}/thestage/services/config_provider/config_provider.py

@@ -10,7 +10,7 @@ from thestage.exceptions.file_system_exception import FileSystemException
 from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.helpers.ssh_util import parse_private_key
 from thestage.services.connect.dto.remote_server_config import RemoteServerConfig
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 from thestage.services.project.dto.project_config import ProjectConfig
 from thestage.config import THESTAGE_CONFIG_DIR, THESTAGE_CONFIG_FILE, THESTAGE_AUTH_TOKEN, THESTAGE_API_URL
 
@@ -20,30 +20,27 @@ class ConfigProvider():
     _local_config_path: Optional[Path] = None
     _global_config_path: Optional[Path] = None
     _global_config_file: Optional[Path] = None
-    _file_system_service = FileSystemServiceCore
+    _file_system_service = FileSystemService
 
 
     def __init__(
             self,
             local_path: Optional[str] = None,
     ):
-        self._file_system_service = FileSystemServiceCore()
+        self._file_system_service = FileSystemService()
         if local_path:
             self._local_path = self._file_system_service.get_path(directory=local_path, auto_create=False)
 
-        config_folder_name = self._file_system_service.get_path(f"{THESTAGE_CONFIG_DIR}", False)
-        self._local_config_path = self._local_path.joinpath(config_folder_name)
+        self._local_config_path = self._local_path.joinpath(THESTAGE_CONFIG_DIR)
 
         home_dir = self._file_system_service.get_home_path()
-        self._global_config_path = home_dir.joinpath(config_folder_name)
+        self._global_config_path = home_dir.joinpath(THESTAGE_CONFIG_DIR)
 
         if self._global_config_path:
             if not self._global_config_path.exists():
                 self._file_system_service.create_if_not_exists_dir(self._global_config_path)
 
-        self._global_config_file = self._global_config_path.joinpath(
-            self._file_system_service.get_path(f"{THESTAGE_CONFIG_FILE}", False)
-        )
+        self._global_config_file = self._global_config_path.joinpath(THESTAGE_CONFIG_FILE)
         if not self._global_config_file.exists():
             self._file_system_service.create_if_not_exists_file(self._global_config_file)
 
@@ -61,7 +58,7 @@ class ConfigProvider():
         if config_from_env:
             self.__update_config_values_dict(values_to_update=config_values, new_values=config_from_env)
 
-        config_from_file = self.__read_config_file(self._global_config_file)
+        config_from_file = self._file_system_service.read_config_file(self._global_config_file)
         if config_from_file:
             self.__update_config_values_dict(values_to_update=config_values, new_values=config_from_file)
 
@@ -112,7 +109,7 @@ class ConfigProvider():
         if not project_data_filepath.exists():
             return None
 
-        config_data = self.__read_config_file(project_data_filepath) if project_data_filepath and project_data_filepath.exists() else {}
+        config_data = self._file_system_service.read_config_file(project_data_filepath) if project_data_filepath and project_data_filepath.exists() else {}
         return ProjectConfig.model_validate(config_data)
 
 
@@ -165,7 +162,7 @@ class ConfigProvider():
         if not config_filepath.is_file():
             return None
 
-        config_data = self.__read_config_file(config_filepath) if config_filepath and config_filepath.exists() else {}
+        config_data = self._file_system_service.read_config_file(config_filepath) if config_filepath and config_filepath.exists() else {}
         return RemoteServerConfig.model_validate(config_data)
 
 
@@ -188,22 +185,6 @@ class ConfigProvider():
             else:
                 values_to_update['main'] = new_values['main']
 
-
-    def __read_config_file(self, path: Path) -> Dict[str, Any]:
-        result = {}
-        try:
-            if path and path.exists():
-                with path.open("r") as file:
-                    try:
-                        if os.stat(path).st_size != 0:
-                            result = json.load(file)
-                    except JSONDecodeError:
-                        pass
-        except OSError:
-            raise FileSystemException(f"Could not open config file: {path}")
-        return result
-
-
     @staticmethod
     def __save_config_file(data: Dict, file_path: Path):
         with open(file_path, 'w') as configfile:
@@ -211,7 +192,7 @@ class ConfigProvider():
 
 
     def save_config(self, config: ConfigEntity):
-        data: Dict[str, Any] = self.__read_config_file(self._global_config_file)
+        data: Dict[str, Any] = self._file_system_service.read_config_file(self._global_config_file)
         data.update(config.model_dump(exclude_none=True, by_alias=True, exclude={'runtime', 'RUNTIME', 'daemon', 'DAEMON'}))
         self.__save_config_file(data=data, file_path=self._global_config_file)