cnhkmcp 1.2.1__py3-none-any.whl → 1.2.2__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.2"
 __author__ = "CNHK"
 __email__ = "cnhk@example.com"
 

cnhkmcp/untracked/platform_functions.py

@@ -389,7 +389,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 +423,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 +1062,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,14 +1212,54 @@ brain_client = BrainApiClient()
 # Configuration management
 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)
+
+    When for_write is True, prefers module directory (or env path) and will
+    return that even if it doesn't exist yet.
+    """
+    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)
+
 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]:
@@ -1237,10 +1277,16 @@ def load_brain_credentials() -> Optional[tuple]:
     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}")
 
@@ -1946,10 +1992,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.2.dist-info}/METADATA

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

@@ -0,0 +1,10 @@
+cnhkmcp/__init__.py,sha256=jLSpv4B0gds0czwoFi1w5-qZBViB9f8yUZN4_9U1yf8,2758
+cnhkmcp/untracked/forum_functions.py,sha256=78wzvN_UYWwbWU40q8_FJNSFPJnND6W9ZRey6MSSiEk,45516
+cnhkmcp/untracked/platform_functions.py,sha256=7Vnul6prlHwCNB0L0X_sLwR_-C53y1sKDhAKF6KOE1A,82452
+cnhkmcp/untracked/user_config.json,sha256=_INn1X1qIsITrmEno-BRlQOAGm9wnNCw-6B333DEvnk,695
+cnhkmcp-1.2.2.dist-info/licenses/LICENSE,sha256=QLxO2eNMnJQEdI_R1UV2AOD-IvuA8zVrkHWA4D9gtoc,1081
+cnhkmcp-1.2.2.dist-info/METADATA,sha256=xAuZdgGb0hWe_FmVuTT0JTVwjb3tstKBcyerAlr8rMI,5171
+cnhkmcp-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cnhkmcp-1.2.2.dist-info/entry_points.txt,sha256=lTQieVyIvjhSMK4fT-XwnccY-JBC1H4vVQ3V9dDM-Pc,70
+cnhkmcp-1.2.2.dist-info/top_level.txt,sha256=x--ibUcSgOS9Z_RWK2Qc-vfs7DaXQN-WMaaxEETJ1Bw,8
+cnhkmcp-1.2.2.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,,