cnhkmcp 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

cnhkmcp/__init__.py

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

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__)
@@ -389,7 +392,7 @@ class BrainApiClient:
             response = self.session.get(f"{self.base_url}/data-sets", params=params)
             response.raise_for_status()
             response = response.json()
-            response['extraNote'] = "if your returned result is 0, you may want to check your parameter by using get_instrument_options tool to got correct parameter"
+            response['extraNote'] = "if your returned result is 0, you may want to check your parameter by using get_platform_setting_options tool to got correct parameter"
             return response
         except Exception as e:
             self.log(f"Failed to get datasets: {str(e)}", "ERROR")
@@ -423,7 +426,7 @@ class BrainApiClient:
             response = self.session.get(f"{self.base_url}/data-fields", params=params)
             response.raise_for_status()
             response = response.json()
-            response['extraNote'] = "if your returned result is 0, you may want to check your parameter by using get_instrument_options tool to got correct parameter"
+            response['extraNote'] = "if your returned result is 0, you may want to check your parameter by using get_platform_setting_options tool to got correct parameter"
             return response
         except Exception as e:
             self.log(f"Failed to get datafields: {str(e)}", "ERROR")
@@ -1062,7 +1065,7 @@ class BrainApiClient:
             self.log(f"Failed to get competition agreement: {str(e)}", "ERROR")
             raise
 
-    async def get_instrument_options(self) -> Dict[str, Any]:
+    async def get_platform_setting_options(self) -> Dict[str, Any]:
         """Get available instrument types, regions, delays, and universes."""
         await self.ensure_authenticated()
         
@@ -1212,42 +1215,80 @@ brain_client = BrainApiClient()
 # Configuration management
 CONFIG_FILE = "user_config.json"
 
+def _resolve_config_path(for_write: bool = False) -> str:
+    """
+    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=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:
+        # __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."""
-    if os.path.exists(CONFIG_FILE):
+    """Load configuration from file with robust path resolution.
+
+    Looks for the config in this order: BRAIN_CONFIG_PATH -> module directory -> CWD.
+    Returns an empty dict when not found or on error.
+    """
+    path = _resolve_config_path(for_write=False)
+    if os.path.exists(path):
         try:
-            with open(CONFIG_FILE, 'r') as f:
+            with open(path, 'r', encoding='utf-8') as f:
                 return json.load(f)
         except Exception as e:
-            logger.error(f"Failed to load config: {e}")
+            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."""
+    """Save configuration to file using the resolved config path.
+
+    Uses BRAIN_CONFIG_PATH if set; otherwise writes next to this module.
+    Ensures the target directory exists.
+    """
     try:
-        with open(CONFIG_FILE, 'w') as f:
-            json.dump(config, f, indent=2)
+        path = _resolve_config_path(for_write=True)
+        os.makedirs(os.path.dirname(path), exist_ok=True)
+        with open(path, 'w', encoding='utf-8') as f:
+            json.dump(config, f, indent=2, ensure_ascii=False)
     except Exception as e:
         logger.error(f"Failed to save config: {e}")
 
 # 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.
     
@@ -1261,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\"]"}
@@ -1946,10 +1979,18 @@ async def get_competition_agreement(competition_id: str) -> Dict[str, Any]:
         return {"error": str(e)}
 
 @mcp.tool()
-async def get_instrument_options() -> Dict[str, Any]:
-    """Get available instrument types, regions, delays, and universes."""
+async def get_platform_setting_options() -> Dict[str, Any]:
+    """Discover valid simulation setting options (instrument types, regions, delays, universes, neutralization).
+
+    Use this when a simulation request might contain an invalid/mismatched setting. If an AI or user supplies
+    incorrect parameters (e.g., wrong region for an instrument type), call this tool to retrieve the authoritative
+    option sets and correct the inputs before proceeding.
+
+    Returns:
+        A structured list of valid combinations and choice lists to validate or fix simulation settings.
+    """
     try:
-        return await brain_client.get_instrument_options()
+        return await brain_client.get_platform_setting_options()
     except Exception as e:
         return {"error": str(e)}
 

{cnhkmcp-1.2.1.dist-info → cnhkmcp-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cnhkmcp
-Version: 1.2.1
+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.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+cnhkmcp/__init__.py,sha256=ggwv1_2vTzA1CqKNjy2TavuVVVZ5ByMzSN8Vvt4Hu1g,2758
+cnhkmcp/untracked/forum_functions.py,sha256=78wzvN_UYWwbWU40q8_FJNSFPJnND6W9ZRey6MSSiEk,45516
+cnhkmcp/untracked/platform_functions.py,sha256=fmNz6DVfcpyz8cEWk7JbW3R5-3kbez4zOe520c6FMwQ,81674
+cnhkmcp/untracked/user_config.json,sha256=_INn1X1qIsITrmEno-BRlQOAGm9wnNCw-6B333DEvnk,695
+cnhkmcp-1.2.3.dist-info/licenses/LICENSE,sha256=QLxO2eNMnJQEdI_R1UV2AOD-IvuA8zVrkHWA4D9gtoc,1081
+cnhkmcp-1.2.3.dist-info/METADATA,sha256=Q-o8ejvy53gOpLHwfz1lv5xb0EkGuNoEwMgeqn-ahnE,5171
+cnhkmcp-1.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cnhkmcp-1.2.3.dist-info/entry_points.txt,sha256=lTQieVyIvjhSMK4fT-XwnccY-JBC1H4vVQ3V9dDM-Pc,70
+cnhkmcp-1.2.3.dist-info/top_level.txt,sha256=x--ibUcSgOS9Z_RWK2Qc-vfs7DaXQN-WMaaxEETJ1Bw,8
+cnhkmcp-1.2.3.dist-info/RECORD,,

cnhkmcp-1.2.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-cnhkmcp/__init__.py,sha256=P9ZwPprkFWPMsX6zdprKviA-9LODjQ-eocdzhLiZNkg,2758
-cnhkmcp/untracked/forum_functions.py,sha256=78wzvN_UYWwbWU40q8_FJNSFPJnND6W9ZRey6MSSiEk,45516
-cnhkmcp/untracked/platform_functions.py,sha256=LQ0s1dASC_2KoZ5XhRf4G2mRZERMN2bScOklnRVyfdQ,80066
-cnhkmcp/untracked/user_config.json,sha256=_INn1X1qIsITrmEno-BRlQOAGm9wnNCw-6B333DEvnk,695
-cnhkmcp-1.2.1.dist-info/licenses/LICENSE,sha256=QLxO2eNMnJQEdI_R1UV2AOD-IvuA8zVrkHWA4D9gtoc,1081
-cnhkmcp-1.2.1.dist-info/METADATA,sha256=D1f88diDrbkAj8XrL0aGTodOl74L5KzIY-5XvEPfbkE,5171
-cnhkmcp-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cnhkmcp-1.2.1.dist-info/entry_points.txt,sha256=lTQieVyIvjhSMK4fT-XwnccY-JBC1H4vVQ3V9dDM-Pc,70
-cnhkmcp-1.2.1.dist-info/top_level.txt,sha256=x--ibUcSgOS9Z_RWK2Qc-vfs7DaXQN-WMaaxEETJ1Bw,8
-cnhkmcp-1.2.1.dist-info/RECORD,,