pmxt 1.0.1__py3-none-any.whl → 1.0.4__py3-none-any.whl

pmxt/client.py

@@ -198,6 +198,12 @@ class Exchange(ABC):
         # Configure the API client with the actual base URL
         config = Configuration(host=base_url)
         self._api_client = ApiClient(configuration=config)
+        
+        # Add access token from lock file
+        server_info = self._server_manager.get_server_info()
+        if server_info and 'accessToken' in server_info:
+            self._api_client.default_headers['x-pmxt-access-token'] = server_info['accessToken']
+            
         self._api = DefaultApi(api_client=self._api_client)
     
     def _handle_response(self, response: Dict[str, Any]) -> Any:

pmxt/server_manager.py

@@ -69,15 +69,62 @@ class ServerManager:
         Raises:
             Exception: If server fails to start or become healthy
         """
-        # Step 1: Check if server is already running
+        # Step 1: Check if force restart is requested (DEV MODE)
+        if os.getenv('PMXT_ALWAYS_RESTART') == '1':
+            self._kill_old_server()
+
+        # Step 2: Check if server is already running and matches version
         if self.is_server_alive():
-            return
+            if self._is_version_mismatch():
+                # print("PMXT: Version mismatch detected. Restarting server...")
+                self._kill_old_server()
+            else:
+                return
         
-        # Step 2: Start server via launcher
+        # Step 3: Start server via launcher
         self._start_server_via_launcher()
         
-        # Step 3: Wait for health check
+        # Step 4: Wait for health check
         self._wait_for_health()
+
+    def _is_version_mismatch(self) -> bool:
+        """Check if running server version matches expected version."""
+        server_info = self.get_server_info()
+        if not server_info or 'version' not in server_info:
+            return True # Old server without version
+        
+        # Get expected version
+        try:
+            # 1. Check production path (bundled)
+            pkg_path = Path(__file__).parent / '_server' / 'package.json'
+            
+            # 2. Check dev path (monorepo)
+            if not pkg_path.exists():
+                # Traverse up to find core/package.json
+                pkg_path = Path(__file__).parent.parent.parent.parent / 'core' / 'package.json'
+
+            if pkg_path.exists():
+                data = json.loads(pkg_path.read_text())
+                expected_version = data.get('version')
+                if expected_version and not server_info['version'].startswith(expected_version):
+                     return True
+        except:
+            pass
+            
+        return False
+
+    def _kill_old_server(self) -> None:
+        """Kill the currently running server."""
+        server_info = self.get_server_info()
+        if server_info and 'pid' in server_info:
+            import signal
+            try:
+                os.kill(server_info['pid'], signal.SIGTERM)
+                # Brief wait for cleanup
+                time.sleep(0.5)
+            except:
+                pass
+        self._remove_stale_lock()
     
     def is_server_alive(self) -> bool:
         """
@@ -144,18 +191,29 @@ class ServerManager:
         """
         Start the server using the pmxt-ensure-server launcher.
         """
-        # 1. Check for local development paths first
+        # 1. Check for bundled server (PRODUCTION - installed via pip)
+        bundled_launcher = Path(__file__).parent / '_server' / 'bin' / 'pmxt-ensure-server'
+        
+        # 2. Check for monorepo structure (DEVELOPMENT)
         current_file = Path(__file__).resolve()
-        # Look for ../../bin/pmxt-ensure-server (monorepo structure)
-        local_launcher = current_file.parent.parent.parent / 'bin' / 'pmxt-ensure-server'
+        local_launcher = current_file.parent.parent.parent.parent / 'core' / 'bin' / 'pmxt-ensure-server'
         
-        launcher = str(local_launcher) if local_launcher.exists() else shutil.which('pmxt-ensure-server')
+        # 3. Check PATH (GLOBAL INSTALL)
+        path_launcher = shutil.which('pmxt-ensure-server')
         
-        if not launcher:
+        # Priority order: bundled > local dev > PATH
+        if bundled_launcher.exists():
+            launcher = str(bundled_launcher)
+        elif local_launcher.exists():
+            launcher = str(local_launcher)
+        elif path_launcher:
+            launcher = path_launcher
+        else:
             raise Exception(
                 "pmxt-ensure-server not found.\n"
-                "Local search failed and not in PATH.\n"
-                "Please install the server: npm install -g pmxtjs"
+                "This should have been bundled with the package.\n"
+                "Please reinstall: pip install --force-reinstall pmxt\n"
+                "Or install the server manually: npm install -g pmxt-core"
             )
         
         # Call the launcher

{pmxt-1.0.1.dist-info → pmxt-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pmxt
-Version: 1.0.1
+Version: 1.0.4
 Summary: Unified prediction market data API - The ccxt for prediction markets
 Author: PMXT Contributors
 License: MIT

{pmxt-1.0.1.dist-info → pmxt-1.0.4.dist-info}/RECORD

@@ -1,11 +1,14 @@
-pmxt/__init__.py,sha256=I84TjHQFVD84qYfgQzAipnaxF54NBoeOzlOS7eL_xps,1150
-pmxt/client.py,sha256=pXAPl_IPhnza2xwlObSlLia9aWpBHA97Nsxq9aP3yvU,23485
+pmxt/__init__.py,sha256=Ndcnaw9g7pzjDlzyp--yAC7kWkAoZIOdm6qKu0JgNPY,1150
+pmxt/client.py,sha256=zetDOeeVfbPB8FAYmAJ0TKBm8ayecMXKunC3T-Rr9qM,23764
 pmxt/models.py,sha256=Mu0hLVjQU3PM5m68poK61VQcJtPQ8ZdLdLU7pq1lqjQ,6004
-pmxt/server_manager.py,sha256=XmvNhBia3ex7XyIcxy2pIdoCHu_Y4R7tKSEWrw2jaKc,8320
-pmxt_internal/__init__.py,sha256=C-gVAVkcuSGwGO_RizwP6CcUywnL6GEln8n5fWdPGkg,5973
-pmxt_internal/api_client.py,sha256=Or2AVtohO9R9hWORQWYvSNeI09cjANbSDG-VtnHhyHY,27889
+pmxt/server_manager.py,sha256=wmHcGBM3oMNLSajCZ0xnANNSmqBYt9vWxQzeYmfo0-Y,10635
+pmxt/_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pmxt/_server/bin/pmxt-ensure-server,sha256=kXIond0UbxS52FAVQD7kHmSBaL_s6cbIyapLRr4KZJw,4544
+pmxt/_server/server/bundled.js,sha256=xz4CbngIw6bEk9-WJx01Ot36WnksbRs2Q48VqMnXDzQ,3395261
+pmxt_internal/__init__.py,sha256=7zNRfRaiNCcIEPMdprPwqzukZr8KuGTuh6shFyuLpcc,5973
+pmxt_internal/api_client.py,sha256=qyxGwvCTSfLqocSG0TeVhPPxR1SwJ5TPfLOKb1f6cf8,27889
 pmxt_internal/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-pmxt_internal/configuration.py,sha256=tm1iEGbjjtgFaNzwQILH6xZLUyy8TwllHcn9QZDElHM,18320
+pmxt_internal/configuration.py,sha256=pu1_jLL1TW9moJrv7nD5-lFWfdKm7JxgazKS1bNjfnU,18320
 pmxt_internal/exceptions.py,sha256=txF8A7vlan57JS69kFPs-IZF-Qhp7IZobBTJVa4fOaM,6644
 pmxt_internal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pmxt_internal/rest.py,sha256=FMj4yaV6XLr842u_ScWHSzQsTFdk0jaUeuWLJoRbogQ,9760
@@ -50,7 +53,7 @@ pmxt_internal/models/search_markets_request.py,sha256=BARoy2GXgV7RQNIGck6UaOyQqf
 pmxt_internal/models/search_markets_request_args_inner.py,sha256=PkusFd_OxhUsItsBpluPJA11zg0sXXjbOK-lPmemvLs,5561
 pmxt_internal/models/trade.py,sha256=U6Fc18rbwILs9FmX8CSDYYL8dF6763l8QzeMQNRxQdo,3328
 pmxt_internal/models/unified_market.py,sha256=mNyUrGKWxvI2f2KCa2uhGwq22cBdDia2hD5AtzFw8fE,4487
-pmxt-1.0.1.dist-info/METADATA,sha256=POG07mOia5wAMbM4z41CIFipNWp3XOZneA2N9mcHTuA,6300
-pmxt-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pmxt-1.0.1.dist-info/top_level.txt,sha256=J_jrcouJ-x-5lpcXMxeW0GOSi1HsBVR5_PdSfvigVrw,19
-pmxt-1.0.1.dist-info/RECORD,,
+pmxt-1.0.4.dist-info/METADATA,sha256=6AMypjzaOIHmwVKQ2L8hKBz2shiE5lqVqmisxL88OB4,6300
+pmxt-1.0.4.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+pmxt-1.0.4.dist-info/top_level.txt,sha256=J_jrcouJ-x-5lpcXMxeW0GOSi1HsBVR5_PdSfvigVrw,19
+pmxt-1.0.4.dist-info/RECORD,,

{pmxt-1.0.1.dist-info → pmxt-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pmxt_internal/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.0.1"
+__version__ = "1.0.4"
 
 # Define package exports
 __all__ = [

pmxt_internal/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.1/python'
+        self.user_agent = 'OpenAPI-Generator/1.0.4/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

pmxt_internal/configuration.py

@@ -506,7 +506,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.4.4\n"\
-               "SDK Package Version: 1.0.1".\
+               "SDK Package Version: 1.0.4".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]: