Refactor dependency installation in test workflow and improve module imports. Streamlined package installation process and added lazy loading for imports to avoid cyclic dependencies. Enhanced error handling for missing requests library.

Author: JakeTrock

.github/workflows/test.yml

@@ -44,17 +44,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest requests || { echo 'Failed to install test dependencies'; exit 1; }
+        pip install pytest || { echo 'Failed to install pytest'; exit 1; }
         
-    - name: Install package dependencies (pre-installation)
+    - name: Install package and dependencies 
       run: |
-        # Installing dependencies before the package to avoid build errors
-        pip install requests anthropic openai langchain langchain-core langchain-openai langchain-anthropic || { echo 'Failed to install dependencies'; exit 1; }
+        # Install package and all its dependencies including optional ones
+        pip install -e ".[all]" requests || { echo 'Failed to install package'; exit 1; }
         
-    - name: Install package
-      run: |
-        pip install -e . || { echo 'Failed to install editable package'; exit 1; }
-
     - name: List installed packages
       run: pip list
 

osmosis_wrap/__init__.py

@@ -34,43 +34,55 @@
 - LangChain (LLMs, Chat Models, and Prompt Templates)
 """
 
-from . import utils
-from . import consts
-from .adapters import anthropic, openai
-from .logger import logger, reconfigure_logger
+# Import consts directly to avoid cyclic imports
+from .consts import package_name, package_version, indent
 
-# Re-export configuration flags for easy access
-enabled = utils.enabled
-use_stderr = utils.use_stderr
-pretty_print = utils.pretty_print
-print_messages = utils.print_messages
-indent = consts.indent
-
-# Re-export initialization function
-init = utils.init
-
-# Export adapter functions
-wrap_anthropic = anthropic.wrap_anthropic
-wrap_openai = openai.wrap_openai
-
-# Export disable and enable functions
-disable_hoover = utils.disable_hoover
-enable_hoover = utils.enable_hoover
-
-# Automatically apply patches when the module is imported
-wrap_anthropic()
-wrap_openai()
-
-# Conditionally load and apply LangChain wrapper
-try:
-    from .adapters import langchain
-    wrap_langchain = langchain.wrap_langchain
-    # Apply the wrapper, but don't fail if it doesn't work
+# Use lazy imports to avoid importing modules during setup
+def _import_modules():
+    global utils, logger, reconfigure_logger, anthropic, openai, langchain
+    global enabled, use_stderr, pretty_print, print_messages
+    global init, wrap_anthropic, wrap_openai, disable_hoover, enable_hoover, wrap_langchain
+    
+    from . import utils
+    from .logger import logger, reconfigure_logger
+    from .adapters import anthropic, openai
+    
+    # Re-export configuration flags for easy access
+    enabled = utils.enabled
+    use_stderr = utils.use_stderr
+    pretty_print = utils.pretty_print
+    print_messages = utils.print_messages
+    
+    # Re-export initialization function
+    init = utils.init
+    
+    # Export adapter functions
+    wrap_anthropic = anthropic.wrap_anthropic
+    wrap_openai = openai.wrap_openai
+    
+    # Export disable and enable functions
+    disable_hoover = utils.disable_hoover
+    enable_hoover = utils.enable_hoover
+    
+    # Automatically apply patches when the module is imported
+    wrap_anthropic()
+    wrap_openai()
+    
+    # Conditionally load and apply LangChain wrapper
     try:
-        wrap_langchain()
-    except Exception as e:
-        logger.warning(f"Failed to wrap LangChain: {str(e)}")
-except ImportError:
-    # LangChain not installed or not compatible
-    def wrap_langchain():
-        logger.warning("LangChain support not available. Install LangChain to use this feature.") 
+        from .adapters import langchain
+        wrap_langchain = langchain.wrap_langchain
+        # Apply the wrapper, but don't fail if it doesn't work
+        try:
+            wrap_langchain()
+        except Exception as e:
+            logger.warning(f"Failed to wrap LangChain: {str(e)}")
+    except ImportError:
+        # LangChain not installed or not compatible
+        def wrap_langchain():
+            logger.warning("LangChain support not available. Install LangChain to use this feature.")
+
+# Initialize the module on first import, but not during installation
+import sys
+if 'pip' not in sys.modules:
+    _import_modules() 

osmosis_wrap/utils.py

@@ -4,9 +4,8 @@
 
 import json
 import sys
-import requests
 from datetime import datetime, timezone
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 # Import constants
 from .consts import hoover_api_url
@@ -57,6 +56,9 @@ def send_to_hoover(query: Dict[str, Any], response: Dict[str, Any], status: int
         return
 
     try:
+        # Import requests only when needed
+        import requests
+        
         # Create headers
         headers = {
             "Content-Type": "application/json",
@@ -82,5 +84,7 @@ def send_to_hoover(query: Dict[str, Any], response: Dict[str, Any], status: int
         if response_data.status_code != 200:
             logger.warning(f"Hoover API returned status {response_data.status_code} for data")
 
+    except ImportError:
+        logger.warning("Requests library not installed. Please install it with 'pip install requests'.")
     except Exception as e:
         logger.warning(f"Failed to send data to Hoover API: {str(e)}")