fyers-apiv3 3.0.2__tar.gz → 3.0.3__tar.gz

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fyers_apiv3
-Version: 3.0.2
+Version: 3.0.3
 Summary: Fyers trading APIs.
 Home-page: https://github.com/FyersDev/fyers-api-py
 Author: Fyers-Tech

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/fyers_apiv3/FyersWebsocket/data_ws.py

@@ -87,6 +87,8 @@ class SymbolConversion:
                         values["fyToken"] = data["v"]["fyToken"]
                         values["symbol"] = data["v"]["symbol"]
                         key = values["fyToken"][:4]
+                        if key not in exch_seg_dict:
+                            continue
                         values["segment"] = exch_seg_dict[key]
                         data = values["symbol"].split("-")
                         update_dict = True
@@ -120,7 +122,8 @@ class SymbolConversion:
                     elif data["s"] == "error":
                         wrong_symbol.append(data["n"])
                 return (datadict, wrong_symbol, dp_index_flag)
-            return ({}, [])
+            
+            return ({}, [],dp_index_flag)
         except Exception as e:
             self.data_logger.exception(e)
 
@@ -196,6 +199,8 @@ class FyersDataSocket:
         self.scrips_per_channel = {}
         self.restart_flag = reconnect
         self.websocket_lock = threading.Lock()
+        self.message_lock = threading.Lock()
+        self.message_condition = threading.Condition(lock=self.message_lock)
         self.unsub_symbol = []
         for i in range(1, 31):
             self.scrips_per_channel[i] = []
@@ -251,8 +256,9 @@ class FyersDataSocket:
             bool: True if the token is valid and not expired, False otherwise.
         """
         try:
-            _ , payload_b64, _ = self.__access_token.split(".")
+            header_token , payload_b64, _ = self.__access_token.split(".")
             # Decode the base64 encoded payload
+            decoded_header = base64.urlsafe_b64decode(header_token + "===")
             decoded_payload = base64.urlsafe_b64decode(payload_b64 + "===")
             # Convert the decoded payload to a string (assuming it's in JSON format)
             decode_token = json.loads(decoded_payload.decode())
@@ -271,7 +277,7 @@ class FyersDataSocket:
             self.__hsm_token = decode_token["hsm_key"]
             return True
         
-        except Exception as e:
+        except:
             self.On_error(
                 {   "type": defines.AUTH_TYPE,
                     "code": defines.INVALID_CODE,
@@ -279,7 +285,7 @@ class FyersDataSocket:
                     "s": defines.ERROR,
                 }
             )
-            self.data_logger.error(e)
+            # self.data_logger.error(e)
             return False
 
 
@@ -308,10 +314,10 @@ class FyersDataSocket:
 
             # Field-1: AuthToken
             field1_id = 1
-            field1_size = len(self.__access_token)
+            field1_size = len(self.__hsm_token)
             byte_buffer.extend(bytes([field1_id]))
             byte_buffer.extend(struct.pack("!H", field1_size))
-            byte_buffer.extend(self.__access_token.encode())
+            byte_buffer.extend(self.__hsm_token.encode())
 
             # Field-2
             field2_id = 2
@@ -995,7 +1001,10 @@ class FyersDataSocket:
                 message_num = struct.unpack(">I", data[3:7])[0]
                 if self.update_count == self.ack_count:
                     self.ack_msg = self.__ackowledgement_msg(message_num)
-                    self.message.append(self.ack_msg)
+                    # self.message.append(self.ack_msg)
+                    self.add_message(self.ack_msg)
+
+                    
                     self.update_count = 0
             scrip_count = struct.unpack("!H", data[7:9])[0]
             offset = 9
@@ -1368,11 +1377,15 @@ class FyersDataSocket:
                 and self.active_channel != self.channel_num
             ):
                 message = self.__channel_pause_msg(self.active_channel)
-                self.message.append(message)
+                # self.message.append(message)
+                self.add_message(message)
+
 
                 if self.channel_num in self.running_channels:
                     message = self.__channel_resume_msg(self.channel_num)
-                    self.message.append(message)
+                    # self.message.append(message)
+                    self.add_message(message)
+
             self.running_channels.add(self.channel_num)
             self.active_channel = self.channel_num
 
@@ -1421,18 +1434,35 @@ class FyersDataSocket:
 
                 self.__ws_object.send(message, opcode=websocket.ABNF.OPCODE_BINARY)
 
+
+    def add_message(self, message):
+        """
+        Add a message to the list of messages and notify waiting threads.
+
+        Args:
+            message (str): The message to add to the list.
+        """
+        with self.message_lock:
+            self.message.append(message)
+            self.message_condition.notify()
+
+
     def __process_message_queue(self) -> None:
         """
         Processes the message queue by sending messages sequentially.
         """
 
         while not self.message_thread_stop_event.is_set():
-            if len(self.message) > 0:
-                message = self.message.pop(0)
-                self.__send_message(message)
-                time.sleep(0.6)
-            else:
-                pass
+                    with self.message_lock:
+                        while not self.message:  # Use a loop to handle spurious wake-ups
+                            self.message_condition.wait()
+
+                        # Once a message is available, pop it from the queue
+                        message = self.message.pop(0)
+
+                    # Send the message outside the lock to avoid blocking other threads
+                    self.__send_message(message)
+
 
     def On_error(self, message: dict) -> None:
         """
@@ -1501,13 +1531,17 @@ class FyersDataSocket:
             self.message_thread.start()
             self.ping_thread.start()
             message = self.__access_token_msg()
-            self.message.append(message)
+            # self.message.append(message)
+            self.add_message(message)
             if self.lite:
                 message = self.__lite_mode_msg()
-                self.message.append(message)
+                # self.message.append(message)
+                self.add_message(message)
             else:
                 message = self.__full_mode_msg()
-                self.message.append(message)
+                # self.message.append(message)
+                self.add_message(message)
+
 
     def __on_close(self, ws, close_code, close_reason):
         """
@@ -1536,6 +1570,8 @@ class FyersDataSocket:
                 
                 time.sleep(self.reconnect_delay)
                 self.__ws_object = None
+                self.scrips_per_channel[self.channel_num] = []
+
                 self.connect()
             else:
                 if self.write_to_file:
@@ -1607,6 +1643,7 @@ class FyersDataSocket:
             self.message_thread.join()
             self.ping_thread.join()
             self.__ws_run = False
+            self.scrips_per_channel[self.channel_num] = []
 
 
     def keep_running(self):
@@ -1620,7 +1657,7 @@ class FyersDataSocket:
 
     def infinite_loop(self):
         while self.__ws_run:
-            pass
+            time.sleep(0.5)
 
 
     def is_connected(self):
@@ -1665,7 +1702,9 @@ class FyersDataSocket:
                     ]
                     for symbols in symbol_chunks:
                         message = self.__unsubscription_msg(symbols)
-                        self.message.append(message)
+                        # self.message.append(message)
+                        self.add_message(message)
+
                 else:
                     self.On_error(
                         {
@@ -1716,7 +1755,9 @@ class FyersDataSocket:
                 ]
                 for symbols in symbol_chunks:
                     message = self.__subscription_msg(symbols)
-                    self.message.append(message)
+                    # self.message.append(message)
+                    self.add_message(message)
+
 
         except Exception as e:
             self.data_logger.exception(e)

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/fyers_apiv3/FyersWebsocket/map.json

@@ -255,7 +255,7 @@
         "validity":"orderValidity",
         "product_type":"productType",
         "tran_side":"side",
-        "ord_status":"status",
+        "org_ord_status":"status",
         "ord_source":"source",
         "symbol_exch":"ex_sym",
         "symbol_desc":"description"

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/fyers_apiv3/FyersWebsocket/order_ws.py

@@ -392,7 +392,7 @@ class FyersOrderSocket:
 
     def infinite_loop(self):
         while self.__ws_run:
-            pass
+            time.sleep(0.5)
 
     def connect(self) -> None:
         """
@@ -430,8 +430,8 @@ class FyersOrderSocket:
         """
 
         try:
-            self.__init_connection()
-            time.sleep(1)
+            # self.__init_connection()
+            # time.sleep(1)
             if self.__ws_object is not None:
                 self.data_type = []
                 for elem in data_type.split(","):

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/fyers_apiv3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fyers-apiv3
-Version: 3.0.2
+Version: 3.0.3
 Summary: Fyers trading APIs.
 Home-page: https://github.com/FyersDev/fyers-api-py
 Author: Fyers-Tech

{fyers_apiv3-3.0.2 → fyers_apiv3-3.0.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
      name='fyers_apiv3',  
-     version='3.0.2',
+     version='3.0.3',
      author="Fyers-Tech",
      author_email="support@fyers.in",
      description="Fyers trading APIs.",
@@ -14,7 +14,7 @@ setuptools.setup(
      url="https://github.com/FyersDev/fyers-api-py",
      packages=setuptools.find_packages(),
      package_data={  
-         'fyers_apiv3': ['/home/vinay/Documents/API-V3/Main-APIV3/fyers-api-py/fyers_apiv3/FyersWebsocket/map.json']
+         'fyers_apiv3': ['/home/vinay/Documents/API-V3/APIv3r3/fyers-api-py/fyers_apiv3/FyersWebsocket/map.json']
      },
      include_package_data=True,
      install_requires=[