cnhkmcp 1.2.2__tar.gz → 1.2.3__tar.gz

{cnhkmcp-1.2.2/cnhkmcp.egg-info → cnhkmcp-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 1.2.2
+Version: 1.2.3
 Summary: A comprehensive Model Context Protocol (MCP) server for quantitative trading platform integration
 Home-page: https://github.com/cnhk/cnhkmcp
 Author: CNHK

{cnhkmcp-1.2.2 → cnhkmcp-1.2.3}/cnhkmcp/__init__.py

@@ -50,7 +50,7 @@ from .untracked.forum_functions import (
     read_full_forum_post
 )
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __author__ = "CNHK"
 __email__ = "cnhk@example.com"
 

{cnhkmcp-1.2.2 → cnhkmcp-1.2.3}/cnhkmcp/untracked/platform_functions.py

@@ -26,6 +26,9 @@ from bs4 import BeautifulSoup
 from mcp.server.fastmcp import FastMCP
 from pydantic import BaseModel, Field, EmailStr
 
+from pathlib import Path
+
+
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
@@ -1213,39 +1216,44 @@ brain_client = BrainApiClient()
 CONFIG_FILE = "user_config.json"
 
 def _resolve_config_path(for_write: bool = False) -> str:
-    """Resolve the absolute path to the config file.
-
-    Resolution order:
-    1) BRAIN_CONFIG_PATH env var (explicit file path)
-    2) File in the same directory as this Python module
-    3) Current working directory (read fallback only)
+    """
+    Resolve the config file path with this priority:
+    1) BRAIN_CONFIG_PATH (file or directory)
+    2) Directory of running script when available, else current working directory
+    3) Current working directory
 
-    When for_write is True, prefers module directory (or env path) and will
-    return that even if it doesn't exist yet.
+    When for_write=True, returns the preferred path even if it doesn't exist yet.
     """
+    # 1) Explicit override via env var
+    env_path = os.environ.get("BRAIN_CONFIG_PATH")
+    if env_path:
+        p = Path(env_path).expanduser()
+        target = p / CONFIG_FILE if p.is_dir() else p
+        # For read, only if it exists; for write, allow regardless
+        if for_write or target.exists():
+            return str(target.resolve())
+
+    # 2) Script/module directory when available, else CWD (works in notebooks)
+    base_dir = Path.cwd()
     try:
-        # 1) Explicit override
-        env_path = os.environ.get("BRAIN_CONFIG_PATH")
-        if env_path:
-            return os.path.abspath(env_path)
-
-        # 2) Same directory as this .py module
-        module_dir = os.path.dirname(os.path.abspath(__file__))
-        module_path = os.path.join(module_dir, CONFIG_FILE)
-        if not for_write and os.path.exists(module_path):
-            return module_path
-
-        # 3) Fallback to CWD for backward compatibility (read-only preference)
-        cwd_path = os.path.abspath(CONFIG_FILE)
-        if not for_write and os.path.exists(cwd_path):
-            return cwd_path
-
-        # For writes (or when nothing exists), prefer the module directory
-        return module_path
-    except Exception as e:
-        # As a last resort, use the bare filename in CWD
-        logger.error(f"Failed to resolve config path, defaulting to CWD: {e}")
-        return os.path.abspath(CONFIG_FILE)
+        # __file__ is not defined in notebooks; this will fail there and keep CWD
+        script_dir = Path(__file__).resolve().parent  # type: ignore[name-defined]
+        base_dir = script_dir
+    except Exception:
+        # Fall back to current working directory for notebooks/REPL
+        pass
+
+    module_path = base_dir / CONFIG_FILE
+    if not for_write and module_path.exists():
+        return str(module_path.resolve())
+
+    # 3) Fallback to CWD for backward compatibility
+    cwd_path = Path.cwd() / CONFIG_FILE
+    if not for_write and cwd_path.exists():
+        return str(cwd_path.resolve())
+
+    # For writes (or when nothing exists), prefer the module/base directory
+    return str(module_path.resolve())
 
 def load_config() -> Dict[str, Any]:
     """Load configuration from file with robust path resolution.
@@ -1262,19 +1270,6 @@ def load_config() -> Dict[str, Any]:
             logger.error(f"Failed to load config from '{path}': {e}")
     return {}
 
-def load_brain_credentials() -> Optional[tuple]:
-    """Load credentials from .brain_credentials file in home directory."""
-    try:
-        from os.path import expanduser
-        credentials_file = expanduser('~/.brain_credentials')
-        if os.path.exists(credentials_file):
-            with open(credentials_file, 'r') as f:
-                credentials = json.load(f)
-                if isinstance(credentials, list) and len(credentials) == 2:
-                    return tuple(credentials)
-    except Exception as e:
-        logger.error(f"Failed to load .brain_credentials: {e}")
-    return None
 
 def save_config(config: Dict[str, Any]):
     """Save configuration to file using the resolved config path.
@@ -1293,7 +1288,7 @@ def save_config(config: Dict[str, Any]):
 # MCP Tools
 
 @mcp.tool()
-async def authenticate(email: str = "", password: str = "") -> Dict[str, Any]:
+async def authenticate(email: Optional[str] = "", password: Optional[str] = "") -> Dict[str, Any]:
     """
     🔐 Authenticate with WorldQuant BRAIN platform.
     
@@ -1307,20 +1302,12 @@ async def authenticate(email: str = "", password: str = "") -> Dict[str, Any]:
         Authentication result with user info and permissions
     """
     try:
-        # First try to load from .brain_credentials file
-        brain_creds = load_brain_credentials()
-        if brain_creds and not email and not password:
-            email, password = brain_creds
-            print(f"📧 Using credentials from .brain_credentials file: {email}")
-        
-        # If still no credentials, try config file
-        if not email or not password:
-            config = load_config()
-            if 'credentials' in config:
-                if not email:
-                    email = config['credentials'].get('email', '')
-                if not password:
-                    password = config['credentials'].get('password', '')
+        config = load_config()
+        if 'credentials' in config:
+            if not email:
+                email = config['credentials'].get('email', '')
+            if not password:
+                password = config['credentials'].get('password', '')
         
         if not email or not password:
             return {"error": "Email and password required. Either provide them as arguments, configure them in user_config.json, or create a .brain_credentials file in your home directory with format: [\"email\", \"password\"]"}

{cnhkmcp-1.2.2 → cnhkmcp-1.2.3/cnhkmcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 1.2.2
+Version: 1.2.3
 Summary: A comprehensive Model Context Protocol (MCP) server for quantitative trading platform integration
 Home-page: https://github.com/cnhk/cnhkmcp
 Author: CNHK

{cnhkmcp-1.2.2 → cnhkmcp-1.2.3}/setup.py

@@ -13,7 +13,7 @@ def read_requirements():
 
 setup(
     name="cnhkmcp",
-    version="1.2.2",
+    version="1.2.3",
     author="CNHK",
     author_email="cnhk@example.com",
     description="A comprehensive Model Context Protocol (MCP) server for quantitative trading platform integration",