Merge pull request #61 from jgwill/60-fck

that was the ssl=True that was not passed

Author: jgwill

_env.sh

@@ -0,0 +1,41 @@
+
+
+#---START MIGRATD from .env
+session_id=598a16b1-6ada-429d-a587-9bf2d7b9646e
+issue_87_session_id=8dde9377-b261-4399-9048-0dbbe65d7b2e
+
+
+
+session_id_250930143427=314f51c5-36d6-44e3-bf0b-e0a78a58d5e4
+MCP_CONFIGS_FILES="/src/.mcp.STC-IAIP.storytelling-314f51c5-36d6-44e3-bf0b-e0a78a58d5e4.json"
+ADD_DIRS_PATHS="/w/orpheus_ART/ /src/IAIP/ /cesaret/book/_/tcc/ /w/CSV/kb2508"
+session_id_2509301518=f9739d98-7b3e-4eaf-a3e8-1257f8d91d38
+session_id_2509301518_SOUTH=8001afb5-27ac-42f5-956e-31282de665d2
+
+session_id_251006_issue_129_IAIP_AUTOETHNOGRAPHY_AND_CEREMONIAL_DIARIES=7910843e-57bf-4aee-8996-3cae458f6fef
+session_id_251006_issue_129_IAIP_AUTOETHNOGRAPHY_AND_CEREMONIAL_DIARIES_MCP_CONFIG_FILES="/src/.mcp.STC-IAIP.storytelling-314f51c5-36d6-44e3-bf0b-e0a78a58d5e4.json /src/.mcp.github.miadisabelle.json"
+session_id_251006_issue_130_mia_agents_5631e86759004d65865aff8b08e3bc3a="5631e867-5900-4d65-865a-ff8b08e3bc3a"
+
+#251008
+session_id_251008_issue_xyz_arena_DIR_ADDS="/b/Dropbox/jgt/edu/llm_mastery/arenas_250706 /cesaret/book/_/tcc/ /w/CSV/kb2508 /w/orpheus_ART/"
+session_id_251008_issue_xyz_arena_STCGOAL="Fragmented thinking made these directories /b/Dropbox/jgt/edu/llm_mastery/arenas_250706 /cesaret/book/_/tcc/ /w/CSV/kb2508 /w/orpheus_ART/ to occurs, the goal is explore them and we would unify the platform creation for a career I love and something I can present to the community.  They could be considered as implementing the same feature sets or being different packages that we would work on like in @jgwill/ python package."
+session_id_251008_issue_xyz_arena_UUID="0f5aaa1e-faea-4ec3-af79-a594fb3a271d"
+session_id_251008_issue_xyz_arena_TLID="2510081204"
+
+
+
+
+session_id_LAUNCH_IAIP_CLAUDE_4_DIRECTIONS_PROPOSAL_250926=5cf366c5-efb0-4212-8430-71cecd7d190e
+session_id_2510082009_follow_storytelling_session=3c8933e4-791b-42ef-85a6-98b4ab3e68dd
+session_id_jgwill_storytelling_251014=ddd138bd-28ce-4967-97b6-e83113efefde
+session_id_2510161024=df424a00-7514-4332-a240-63275d4ed831
+#---END MIGRATD from .env
+
+
+
+session_id__coaiapy_mcp_2510191020=08636648-9d35-490f-896d-70a2d52d5164
+
+
+session_id__issue_60__UUID=2ab5df9e-447e-467a-ad92-d136f6b8d018
+
+

coaiapy-mcp/coaiapy_mcp/__init__.py

@@ -12,7 +12,7 @@
 instead of subprocess wrappers for better performance and error handling.
 """
 
-__version__ = "0.1.13"
+__version__ = "0.1.18"
 __author__ = "Guillaume Isabelle"
 __email__ = "jgi@jgwill.com"
 

coaiapy-mcp/coaiapy_mcp/server.py

@@ -6,6 +6,11 @@
 
 The server uses direct library imports from coaiapy instead of subprocess
 wrappers for better performance and error handling.
+
+Configuration:
+  COAIAPY_ENV_PATH: Custom path to .env file (default: .env in current directory)
+                   Set via MCP server environment configuration.
+                   Example: COAIAPY_ENV_PATH=/path/to/custom/.env
 """
 
 import asyncio

coaiapy-mcp/coaiapy_mcp/tools.py

@@ -38,29 +38,50 @@
     print("Some tools may not be available.")
 
 # Load configuration once on module import
+# Support custom .env path via COAIAPY_ENV_PATH environment variable
 try:
-    config = coaiamodule.read_config()
+    env_path = os.getenv('COAIAPY_ENV_PATH')
+    config = coaiamodule.read_config(env_path=env_path)
 except Exception as e:
     print(f"Warning: Could not load config: {e}")
     config = {}
 
 # Initialize Redis client
-redis_config = config.get("jtaleconf", {})
-try:
-    redis_client = redis.Redis(
-        host=redis_config.get("host", "localhost"),
-        port=redis_config.get("port", 6379),
-        db=redis_config.get("db", 0),
-        password=redis_config.get("password") if redis_config.get("password") else None,
-        decode_responses=True,
-    )
-    # Test connection
-    redis_client.ping()
-    REDIS_AVAILABLE = True
-except (redis.RedisError, redis.ConnectionError) as e:
-    print(f"Warning: Redis not available: {e}")
-    redis_client = None
-    REDIS_AVAILABLE = False
+# Try direct URL first (handles SSL automatically), fall back to component config
+redis_client = None
+REDIS_AVAILABLE = False
+
+# Check for direct Redis URL from environment
+redis_url = os.getenv('REDIS_URL') or os.getenv('KV_URL')
+if redis_url:
+    try:
+        redis_client = redis.from_url(redis_url, decode_responses=True)
+        redis_client.ping()
+        REDIS_AVAILABLE = True
+    except Exception as e:
+        print(f"Warning: Redis connection failed with URL: {e}")
+        redis_client = None
+
+# Fall back to component-based config if URL didn't work
+if not REDIS_AVAILABLE:
+    redis_config = config.get("jtaleconf", {})
+    try:
+        redis_client = redis.Redis(
+            host=redis_config.get("host", "localhost"),
+            port=redis_config.get("port", 6379),
+            db=redis_config.get("db", 0),
+            password=redis_config.get("password") if redis_config.get("password") else None,
+            ssl=redis_config.get("ssl", False),
+            ssl_cert_reqs="none" if redis_config.get("ssl") else "required",
+            decode_responses=True,
+        )
+        # Test connection
+        redis_client.ping()
+        REDIS_AVAILABLE = True
+    except (redis.RedisError, redis.ConnectionError) as e:
+        print(f"Warning: Redis not available: {e}")
+        redis_client = None
+        REDIS_AVAILABLE = False
 
 # Initialize Langfuse client
 try:

coaiapy-mcp/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "coaiapy-mcp"
-version = "0.1.13"
+version = "0.1.18"
 description = "MCP (Model Context Protocol) wrapper for coaiapy observability toolkit"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "coaiapy>=0.2.87",
+    "coaiapy>=0.2.95",
     "mcp>=1.0.0",
     "pydantic>=2.0",
     "langfuse>=2.0",
@@ -62,4 +62,4 @@ target-version = ['py310']
 
 [tool.ruff]
 line-length = 100
-target-version = "0.1.13"
+target-version = "0.1.18"

coaiapy-mcp/release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+conda activate coaiapy
 # coaiapy-mcp Release Script
 # Prepares distribution and publishes to PyPI
 

coaiapy-mcp/requirements.txt

@@ -1,5 +1,5 @@
 # Core dependencies
-coaiapy>=0.2.87
+coaiapy>=0.2.95
 mcp>=1.0.0
 pydantic>=2.0
 langfuse>=2.0

coaiapy/coaiamodule.py

@@ -10,6 +10,7 @@
 
 # version in pyrec prod
 config=None
+_loaded_env_path=None  # Track which env_path was used to load config
 
 
 def find_existing_config():
@@ -54,14 +55,15 @@ def find_existing_config():
 
 def load_env_file(env_path='.env'):
     """Simple .env file loader compatible with Python 3.6
-    
-    Loads environment variables from .env file and sets them in os.environ
-    ONLY if they don't already exist in os.environ (respecting OS env priority).
+
+    Loads environment variables from .env file and sets them in os.environ.
+    Local .env file takes precedence over pre-existing environment variables.
     """
     env_vars = {}
     if os.path.exists(env_path):
         try:
             with open(env_path, 'r') as f:
+                lines_read = 0
                 for line in f:
                     line = line.strip()
                     if line and not line.startswith('#') and '=' in line:
@@ -73,11 +75,15 @@ def load_env_file(env_path='.env'):
                            (value.startswith("'") and value.endswith("'")):
                             value = value[1:-1]
                         env_vars[key] = value
-                        # Set in os.environ ONLY if not already set (respects OS env priority)
-                        if key not in os.environ:
-                            os.environ[key] = value
+                        # Always set in os.environ - local .env takes precedence
+                        os.environ[key] = value
+                        lines_read += 1
         except Exception as e:
-            print(f"Warning: Error loading .env file: {e}")
+            print(f"Warning: Error loading .env file from '{env_path}': {e}")
+    else:
+        # Only warn about missing custom .env paths, not the default .env
+        if env_path != '.env':
+            print(f"Warning: Custom .env file not found: {env_path}")
     return env_vars
 
 def merge_configs(base_config, override_config):
@@ -90,12 +96,21 @@ def merge_configs(base_config, override_config):
             merged[key] = value
     return merged
 
-def read_config():
+def read_config(env_path=None):
     global config
-    
-    if config is None:
+    global _loaded_env_path
+
+    # Determine .env path: explicit param > COAIAPY_ENV_PATH env var > default .env
+    if env_path is None:
+        env_path = os.getenv('COAIAPY_ENV_PATH', '.env')
+
+    # Reload config if env_path changed or config not loaded yet
+    if config is None or _loaded_env_path != env_path:
         # Load .env file first if it exists
-        env_vars = load_env_file()
+        env_vars = load_env_file(env_path)
+        if not env_vars and env_path != '.env':
+            # Warn if custom env_path was specified but file not found
+            print(f"Warning: COAIAPY_ENV_PATH={env_path} was specified but file not found or empty")
 
         # Default configuration
         config = {
@@ -222,6 +237,9 @@ def get_env_value(env_key, config_value, env_vars_dict=None):
         config["langfuse_base_url"] = get_env_value("LANGFUSE_HOST", config.get("langfuse_base_url", "https://us.cloud.langfuse.com"))
         config["langfuse_auth3"] = get_env_value("LANGFUSE_AUTH3", config.get("langfuse_auth3", ""))
 
+        # Track which env_path was used to load this config
+        _loaded_env_path = env_path
+
     return config
 
 

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "coaiapy"
-version = "0.2.87"
+version = "0.2.95"
 description = "A Python package for audio transcription, synthesis, and tagging using Boto3."
 readme = "README.md"
 requires-python = ">=3.6"

release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+conda activate coaiapy
 # CoaiaPy Release Script
 # Prepares distribution and publishes to PyPI
 
@@ -36,4 +36,4 @@ echo "📋 Next steps:"
 echo "   - Push changes: git push origin main"
 echo "   - Push tag: git push origin v${VERSION}"
 echo "   - Verify package on PyPI: https://pypi.org/project/coaiapy/"
-echo "   - Test installation: pip install coaiapy"
+echo "   - Test installation: pip install coaiapy"