promptbuilder 0.4.20__tar.gz → 0.4.21__tar.gz

{promptbuilder-0.4.20/promptbuilder.egg-info → promptbuilder-0.4.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.20
+Version: 0.4.21
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/promptbuilder/llm_client/anthropic_client.py

@@ -136,13 +136,15 @@ class AnthropicLLMClient(BaseLLMClient):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("ANTHROPIC_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         default_max_tokens_strategy: DefaultMaxTokensStrategy = AnthropicDefaultMaxTokensStrategy(),
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("ANTHROPIC_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create an anthropic llm client you need to either set the environment variable ANTHROPIC_API_KEY or pass the api_key in string format")
         super().__init__(AnthropicLLMClient.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)
@@ -422,13 +424,15 @@ class AnthropicLLMClientAsync(BaseLLMClientAsync):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("ANTHROPIC_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         default_max_tokens_strategy: DefaultMaxTokensStrategy = AnthropicDefaultMaxTokensStrategy(),
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("ANTHROPIC_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create an anthropic llm client you need to either set the environment variable ANTHROPIC_API_KEY or pass the api_key in string format")
         super().__init__(AnthropicLLMClientAsync.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/promptbuilder/llm_client/bedrock_client.py

@@ -22,9 +22,9 @@ P = ParamSpec("P")
 class BedrockApiKey(BaseModel, CustomApiKey):
     model_config = ConfigDict(frozen=True)
     
-    aws_access_key_id: str = os.getenv("AWS_ACCESS_KEY_ID")
-    aws_secret_access_key: str = os.getenv("AWS_SECRET_ACCESS_KEY")
-    aws_region: str = os.getenv("AWS_DEFAULT_REGION", "us-east-1")
+    aws_access_key_id: str
+    aws_secret_access_key: str
+    aws_region: str
 
 
 @inherited_decorator
@@ -78,13 +78,19 @@ class BedrockLLMClient(BaseLLMClient):
     def __init__(
         self,
         model: str,
-        api_key: BedrockApiKey = BedrockApiKey(),
+        api_key: BedrockApiKey | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
-        if api_key is None or not isinstance(api_key, BedrockApiKey):
+        if api_key is None:
+            api_key = BedrockApiKey(
+                aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"),
+                aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"),
+                aws_region=os.getenv("AWS_DEFAULT_REGION", "us-east-1"),
+            )
+        if not isinstance(api_key, BedrockApiKey):
             raise ValueError(
                 "To create a bedrock llm client you need to either set the environment variables "
                 "AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and optional AWS_DEFAULT_REGION or pass the api_key as BedrockApiKey instance"
@@ -363,13 +369,19 @@ class BedrockLLMClientAsync(BaseLLMClientAsync):
     def __init__(
         self,
         model: str,
-        api_key: BedrockApiKey = BedrockApiKey(),
+        api_key: BedrockApiKey | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
-        if api_key is None or not isinstance(api_key, BedrockApiKey):
+        if api_key is None:
+            api_key = BedrockApiKey(
+                aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"),
+                aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"),
+                aws_region=os.getenv("AWS_DEFAULT_REGION", "us-east-1"),
+            )
+        if not isinstance(api_key, BedrockApiKey):
             raise ValueError(
                 "To create a bedrock llm client you need to either set the environment variables "
                 "AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and optional AWS_DEFAULT_REGION or pass the api_key as BedrockApiKey instance"

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/promptbuilder/llm_client/google_client.py

@@ -45,12 +45,14 @@ class GoogleLLMClient(BaseLLMClient):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("GOOGLE_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("GOOGLE_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create a google llm client you need to either set the environment variable GOOGLE_API_KEY or pass the api_key in string format")
         super().__init__(GoogleLLMClient.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)
@@ -219,12 +221,14 @@ class GoogleLLMClientAsync(BaseLLMClientAsync):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("GOOGLE_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("GOOGLE_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create a google llm client you need to either set the environment variable GOOGLE_API_KEY or pass the api_key in string format")
         super().__init__(GoogleLLMClientAsync.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/promptbuilder/llm_client/main.py

@@ -40,10 +40,7 @@ def get_client(
     provider, model = full_model_name.split(":", 1)
     if provider in provider_to_client_class:
         client_class = provider_to_client_class[provider]
-        if api_key is None:
-            client = client_class(model, **kwargs)
-        else:
-            client = client_class(model, api_key, **kwargs)
+        client = client_class(model, api_key, **kwargs)
     else:
         if api_key is None:
             raise ValueError(f"You should directly provide api_key for this provider: {provider}")
@@ -87,10 +84,7 @@ def get_async_client(
     provider, model = full_model_name.split(":", 1)
     if provider in provider_to_client_class:
         client_class = provider_to_client_class[provider]
-        if api_key is None:
-            client = client_class(model, **kwargs)
-        else:
-            client = client_class(model, api_key, **kwargs)
+        client = client_class(model, api_key, **kwargs)
     else:
         if api_key is None:
             raise ValueError(f"You should directly provide api_key for this provider: {provider}")

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/promptbuilder/llm_client/openai_client.py

@@ -69,12 +69,14 @@ class OpenaiLLMClient(BaseLLMClient):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("OPENAI_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("OPENAI_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create an openai llm client you need to either set the environment variable OPENAI_API_KEY or pass the api_key in string format")
         super().__init__(OpenaiLLMClient.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)
@@ -356,12 +358,14 @@ class OpenaiLLMClientAsync(BaseLLMClientAsync):
     def __init__(
         self,
         model: str,
-        api_key: str = os.getenv("OPENAI_API_KEY"),
+        api_key: str | None = None,
         decorator_configs: DecoratorConfigs | None = None,
         default_thinking_config: ThinkingConfig | None = None,
         default_max_tokens: int | None = None,
         **kwargs,
     ):
+        if api_key is None:
+            api_key = os.getenv("OPENAI_API_KEY")
         if api_key is None or not isinstance(api_key, str):
             raise ValueError("To create an openai llm client you need to either set the environment variable OPENAI_API_KEY or pass the api_key in string format")
         super().__init__(OpenaiLLMClientAsync.PROVIDER, model, decorator_configs=decorator_configs, default_thinking_config=default_thinking_config, default_max_tokens=default_max_tokens)

{promptbuilder-0.4.20 → promptbuilder-0.4.21/promptbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.20
+Version: 0.4.21
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav

{promptbuilder-0.4.20 → promptbuilder-0.4.21}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="promptbuilder",
-    version="0.4.20",
+    version="0.4.21",
     packages=find_packages(),
     install_requires=[
         "pydantic",