merge main

Author: vbossica

.github/workflows/ci-cd.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false # Don't cancel other jobs if one lint version fails
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false # Don't cancel other jobs if one test version fails
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -116,7 +116,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -204,7 +204,7 @@ jobs:
       fail-fast: true # If one deployment fails, stop others
       matrix:
         # Define ALL python versions for Docker images
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         # Designate ONE primary version for PyPI publish and Docker 'latest' tag
         primary-py: ['3.11'] # Choose your primary Python version
 
@@ -286,7 +286,7 @@ jobs:
           # Use the Git tag from the event ref as the base version
           # Assumes tags are like '0.1.0' or 'v0.1.0' - metadata-action handles 'v' prefix
           tags: |
-            # Generate tags like: 0.1.0-py3.8, 0.1-py3.8, 0-py3.8
+            # Generate tags like: 0.1.0-py3.9, 0.1-py3.9, 0-py3.9
             type=semver,pattern={{version}}-py${{ matrix.python-version }}
             type=semver,pattern={{major}}.{{minor}}-py${{ matrix.python-version }}
             type=semver,pattern={{major}}-py${{ matrix.python-version }}
@@ -315,4 +315,4 @@ jobs:
             PYTHON_VERSION=${{ matrix.python-version }}
             VERSION=${{ steps.get_version_tag.outputs.VERSION }}
           cache-from: type=gha,scope=deploy-${{ matrix.python-version }}
-          cache-to: type=gha,mode=max,scope=deploy-${{ matrix.python-version }}
+          cache-to: type=gha,mode=max,scope=deploy-${{ matrix.python-version }}

README.md

@@ -161,7 +161,7 @@ docker run --rm -v $(pwd):/app -w /app --entrypoint python python-gpt-po -m pyte
 
 ## 📋 Requirements
 
-- Python 3.8+ 
+- Python 3.9+
 - Dependencies: `polib`, `openai`, `anthropic`, `requests`, `tenacity`
 
 ## 📖 Documentation
@@ -172,4 +172,4 @@ docker run --rm -v $(pwd):/app -w /app --entrypoint python python-gpt-po -m pyte
 
 ## 📄 License
 
-MIT License - See [LICENSE](LICENSE) for details.
+MIT License - See [LICENSE](LICENSE) for details.

pyproject.toml

@@ -18,7 +18,7 @@ authors = [
 ]
 description = "A CLI tool for translating .po files using GPT models."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = {text = "MIT"}
 dependencies = [
     "polib==1.2.0",
@@ -42,11 +42,11 @@ classifiers = [
     "Topic :: Text Processing :: Linguistic",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3 :: Only",
     "Natural Language :: English",
     "Natural Language :: Dutch",

python_gpt_po/main.py

@@ -16,8 +16,8 @@
 from .models.provider_clients import ProviderClients
 from .services.model_manager import ModelManager
 from .services.translation_service import TranslationService
-from .utils.cli import (auto_select_provider, create_language_mapping, get_api_keys_from_args, get_provider_from_args,
-                        parse_args, parse_languages, show_help_and_exit, validate_provider_key)
+from .utils.cli import (auto_select_provider, create_language_mapping, get_provider_from_args, parse_args,
+                        parse_languages, show_help_and_exit, validate_provider_key)
 
 
 def setup_logging():
@@ -44,12 +44,9 @@ def initialize_provider(args: Namespace) -> tuple[ProviderClients, ModelProvider
     Raises:
         SystemExit: If no valid provider can be found or initialized
     """
-    # Get API keys from arguments and environment variables
-    api_keys = get_api_keys_from_args(args)
-
     # Initialize provider clients
     provider_clients = ProviderClients()
-    provider_clients.initialize_clients(args, api_keys)
+    api_keys = provider_clients.initialize_clients(args)
 
     # Get provider from arguments or auto-select
     provider = get_provider_from_args(args)

python_gpt_po/models/enums.py

@@ -13,9 +13,4 @@ class ModelProvider(Enum):
     AZURE_OPENAI = "azure_openai"
 
 
-ModelProviderList = [
-    ModelProvider.OPENAI.value,
-    ModelProvider.ANTHROPIC.value,
-    ModelProvider.DEEPSEEK.value,
-    ModelProvider.AZURE_OPENAI.value
-]
+ModelProviderList = [provider.value for provider in ModelProvider]

python_gpt_po/models/provider_clients.py

@@ -22,16 +22,20 @@ def __init__(self):
         self.deepseek_api_key = None
         self.deepseek_base_url = "https://api.deepseek.com/v1"
 
-    def initialize_clients(self, args: Namespace, api_keys: Dict[str, str]):
+    def initialize_clients(self, args: Namespace) -> Dict[str, str]:
         """Initialize API clients for all providers with available keys.
 
         Args:
-            api_keys (Dict[str, str]): Dictionary of provider names to API keys
+            args (Namespace): Parsed command line arguments
+        Returns:
+            Dict[str, str]: Dictionary of API keys for each provider
         """
-        if api_keys.get(ModelProvider.OPENAI.value):
-            self.openai_client = OpenAI(api_key=api_keys[ModelProvider.OPENAI.value])
+        openai_key = args.openai_key or args.api_key or os.getenv("OPENAI_API_KEY", "")
+        if openai_key:
+            self.openai_client = OpenAI(api_key=openai_key)
 
-        if api_keys.get(ModelProvider.AZURE_OPENAI.value):
+        azure_openai_key = args.azure_openai_key or os.getenv("AZURE_OPENAI_API_KEY", "")
+        if azure_openai_key:
             endpoint = args.azure_openai_endpoint or os.getenv("AZURE_OPENAI_ENDPOINT")
             if not endpoint:
                 raise ValueError("Missing Azure OpenAI endpoint.")
@@ -42,12 +46,21 @@ def initialize_clients(self, args: Namespace, api_keys: Dict[str, str]):
 
             self.azure_openai_client = AzureOpenAI(
                 azure_endpoint=endpoint,
-                api_key=api_keys[ModelProvider.AZURE_OPENAI.value],
+                api_key=azure_openai_key,
                 api_version=api_version
             )
 
-        if api_keys.get(ModelProvider.ANTHROPIC.value):
-            self.anthropic_client = Anthropic(api_key=api_keys[ModelProvider.ANTHROPIC.value])
+        antropic_key = args.anthropic_key or os.getenv("ANTHROPIC_API_KEY", "")
+        if antropic_key:
+            self.anthropic_client = Anthropic(api_key=antropic_key)
 
-        if api_keys.get(ModelProvider.DEEPSEEK.value):
-            self.deepseek_api_key = api_keys[ModelProvider.DEEPSEEK.value]
+        deepseek_key = args.deepseek_key or os.getenv("DEEPSEEK_API_KEY", "")
+        if deepseek_key:
+            self.deepseek_api_key = deepseek_key
+
+        return {
+            ModelProvider.OPENAI.value: openai_key,
+            ModelProvider.ANTHROPIC.value: antropic_key,
+            ModelProvider.DEEPSEEK.value: deepseek_key,
+            ModelProvider.AZURE_OPENAI.value: azure_openai_key,
+        }

python_gpt_po/utils/cli.py

@@ -4,7 +4,6 @@
 including argument definitions, help text generation, and command processing.
 """
 import logging
-import os
 import sys
 from argparse import ArgumentParser, Namespace, RawDescriptionHelpFormatter
 from typing import Dict, List, Optional
@@ -259,24 +258,6 @@ def get_provider_from_args(args: Namespace) -> Optional[ModelProvider]:
     return None
 
 
-def get_api_keys_from_args(args: Namespace) -> Dict[str, str]:
-    """
-    Extract API keys from command line arguments and environment variables.
-
-    Args:
-        args (Namespace): Parsed command line arguments
-
-    Returns:
-        Dict[str, str]: Dictionary of provider names to API keys
-    """
-    return {
-        ModelProvider.OPENAI.value: args.openai_key or args.api_key or os.getenv("OPENAI_API_KEY", ""),
-        ModelProvider.ANTHROPIC.value: args.anthropic_key or os.getenv("ANTHROPIC_API_KEY", ""),
-        ModelProvider.DEEPSEEK.value: args.deepseek_key or os.getenv("DEEPSEEK_API_KEY", ""),
-        ModelProvider.AZURE_OPENAI.value: args.azure_openai_key or os.getenv("AZURE_OPENAI_API_KEY", ""),
-    }
-
-
 def auto_select_provider(api_keys: Dict[str, str]) -> Optional[ModelProvider]:
     """
     Auto-select a provider based on available API keys.