Fix parsing bugs for config

Author: h3xxit

src/utcp/client/utcp_client.py

@@ -210,17 +210,17 @@ async def create(cls, config: Optional[Union[Dict[str, Any], UtcpClientConfig]]
 
         client = cls(config, tool_repository, search_strategy, DefaultVariableSubstitutor())
 
-        # If a providers file is used, configure TextTransport to resolve relative paths from its directory
-        if config.providers_file_path:
-            providers_dir = os.path.dirname(os.path.abspath(config.providers_file_path))
-            client.transports["text"] = TextTransport(base_path=providers_dir)
-        
         if client.config.variables:
             config_without_vars = client.config.model_copy()
             config_without_vars.variables = None
             client.config.variables = client.variable_substitutor.substitute(client.config.variables, config_without_vars)
 
-        await client.load_providers(config.providers_file_path)
+        # If a providers file is used, configure TextTransport to resolve relative paths from its directory
+        if config.providers_file_path:
+            providers_dir = os.path.dirname(os.path.abspath(config.providers_file_path))
+            client.transports["text"] = TextTransport(base_path=providers_dir)
+        
+            await client.load_providers(config.providers_file_path)
 
         return client
 

src/utcp/client/utcp_client_config.py

@@ -15,7 +15,7 @@
 
 from abc import ABC, abstractmethod
 from pydantic import BaseModel, Field
-from typing import Optional, List, Dict, Literal, TypedDict
+from typing import Optional, List, Dict, Annotated, Union, Literal
 from dotenv import dotenv_values
 
 class UtcpVariableNotFound(Exception):
@@ -51,7 +51,7 @@ class UtcpVariablesConfig(BaseModel, ABC):
     Attributes:
         type: Type identifier for the variable loader.
     """
-    type: Literal["dotenv"] = "dotenv"
+    type: str
 
     @abstractmethod
     def get(self, key: str) -> Optional[str]:
@@ -81,6 +81,7 @@ class UtcpDotEnv(UtcpVariablesConfig):
         api_key = loader.get("API_KEY")
         ```
     """
+    type: Literal["dotenv"] = "dotenv"
     env_file_path: str
 
     def get(self, key: str) -> Optional[str]:
@@ -94,6 +95,13 @@ def get(self, key: str) -> Optional[str]:
         """
         return dotenv_values(self.env_file_path).get(key)
 
+UtcpVariablesConfigUnion = Annotated[
+    Union[
+        UtcpDotEnv
+    ],
+    Field(discriminator="type")
+]
+
 class UtcpClientConfig(BaseModel):
     """Configuration model for UTCP client setup.
 
@@ -128,4 +136,4 @@ class UtcpClientConfig(BaseModel):
     """
     variables: Optional[Dict[str, str]] = Field(default_factory=dict)
     providers_file_path: Optional[str] = None
-    load_variables_from: Optional[List[UtcpVariablesConfig]] = None
+    load_variables_from: Optional[List[UtcpVariablesConfigUnion]] = None