firstrade 0.0.19__py3-none-any.whl → 0.0.20__py3-none-any.whl

firstrade/order.py

@@ -86,11 +86,6 @@ class Order:
             Order:order_confirmation: Dictionary containing the order confirmation data.
         """
 
-        if dry_run:
-            previewOrders = "1"
-        else:
-            previewOrders = ""
-
         if price_type == PriceType.MARKET:
             price = ""
 
@@ -100,8 +95,8 @@ class Order:
             "orderbar_accountid": "",
             "notional": "yes" if notional else "",
             "stockorderpage": "yes",
-            "submitOrders": "1",
-            "previewOrders": previewOrders,
+            "submitOrders": "",
+            "previewOrders": "1",
             "lotMethod": "1",
             "accountType": "1",
             "quoteprice": "",
@@ -133,6 +128,30 @@ class Order:
             "xml",
         )
         order_confirmation = {}
+        cdata = order_data.find("actiondata").string
+        cdata_soup = BeautifulSoup(cdata, "html.parser")
+        span = (
+            cdata_soup.find("div", class_="msg_bg")
+            .find("div", class_="yellow box")
+            .find("div", class_="error_msg")
+            .find("div", class_="outbox")
+            .find("div", class_="inbox")
+            .find("span")
+        )
+        if span:
+            order_warning = span.text.strip()
+            order_confirmation["warning"] = order_warning
+            data["viewederror"] = "1"
+        if not dry_run:
+            data["previewOrders"] = ""
+            data["submitOrders"] = "1"
+            order_data = BeautifulSoup(
+                self.ft_session.post(
+                    url=urls.orderbar(), headers=urls.session_headers(), data=data
+                ).text,
+                "xml",
+            )
+
         order_success = order_data.find("success").text.strip()
         order_confirmation["success"] = order_success
         action_data = order_data.find("actiondata").text.strip()
@@ -177,48 +196,56 @@ def get_orders(ft_session, account):
 
     # Data dictionary to send with the request
     data = {
-        'accountId': account,
+        "accountId": account,
     }
 
     # Post request to retrieve the order data
-    response = ft_session.post(url=urls.order_list(), headers=urls.session_headers(), data=data).text
+    response = ft_session.post(
+        url=urls.order_list(), headers=urls.session_headers(), data=data
+    ).text
 
     # Parse the response using BeautifulSoup
     soup = BeautifulSoup(response, "html.parser")
 
     # Find the table containing orders
-    table = soup.find('table', class_='tablesorter')
+    table = soup.find("table", class_="tablesorter")
     if not table:
         return []
 
-    rows = table.find_all('tr')[1:]  # skip the header row
+    rows = table.find_all("tr")[1:]  # skip the header row
 
     orders = []
     for row in rows:
         try:
-            cells = row.find_all('td')
-            tooltip_content = row.find('a', {'class': 'info'}).get('onmouseover')
-            tooltip_soup = BeautifulSoup(tooltip_content.split('tooltip.show(')[1].strip("');"), 'html.parser')
-            order_ref = tooltip_soup.find(text=lambda text: 'Order Ref' in text)
-            order_ref_number = order_ref.split('#: ')[1] if order_ref else None
+            cells = row.find_all("td")
+            tooltip_content = row.find("a", {"class": "info"}).get("onmouseover")
+            tooltip_soup = BeautifulSoup(
+                tooltip_content.split("tooltip.show(")[1].strip("');"), "html.parser"
+            )
+            order_ref = tooltip_soup.find(text=lambda text: "Order Ref" in text)
+            order_ref_number = order_ref.split("#: ")[1] if order_ref else None
             status = cells[8]
             # print(status)
-            sub_status = status.find('strong')
+            sub_status = status.find("strong")
             # print(sub_status)
             sub_status = sub_status.get_text(strip=True)
             # print(sub_status)
-            status = status.find('strong').get_text(strip=True) if status.find('strong') else status.get_text(strip=True)
+            status = (
+                status.find("strong").get_text(strip=True)
+                if status.find("strong")
+                else status.get_text(strip=True)
+            )
             order = {
-                'Date/Time': cells[0].get_text(strip=True),
-                'Reference': order_ref_number,
-                'Transaction': cells[1].get_text(strip=True),
-                'Quantity': int(cells[2].get_text(strip=True)),
-                'Symbol': cells[3].get_text(strip=True),
-                'Type': cells[4].get_text(strip=True),
-                'Price': float(cells[5].get_text(strip=True)),
-                'Duration': cells[6].get_text(strip=True),
-                'Instr.': cells[7].get_text(strip=True),
-                'Status': status,
+                "Date/Time": cells[0].get_text(strip=True),
+                "Reference": order_ref_number,
+                "Transaction": cells[1].get_text(strip=True),
+                "Quantity": int(cells[2].get_text(strip=True)),
+                "Symbol": cells[3].get_text(strip=True),
+                "Type": cells[4].get_text(strip=True),
+                "Price": float(cells[5].get_text(strip=True)),
+                "Duration": cells[6].get_text(strip=True),
+                "Instr.": cells[7].get_text(strip=True),
+                "Status": status,
             }
             orders.append(order)
         except Exception as e:

{firstrade-0.0.19.dist-info → firstrade-0.0.20.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: firstrade
-Version: 0.0.19
+Version: 0.0.20
 Summary: An unofficial API for Firstrade
 Home-page: https://github.com/MaxxRK/firstrade-api
-Download-URL: https://github.com/MaxxRK/firstrade-api/archive/refs/tags/0019.tar.gz
+Download-URL: https://github.com/MaxxRK/firstrade-api/archive/refs/tags/0020.tar.gz
 Author: MaxxRK
 Author-email: maxxrk@pm.me
 License: MIT

firstrade-0.0.20.dist-info/RECORD

@@ -0,0 +1,10 @@
+firstrade/__init__.py,sha256=fNiWYgSTjElY1MNv0Ug-sVLMTR2z_Ngri_FY7Pekdrw,95
+firstrade/account.py,sha256=xDgTMXDy2UWUNi4kboXAKKBrbmZGpXLJ11MCHlMvzB0,9218
+firstrade/order.py,sha256=chDqutqA3H7_5NMnleGoqD3OdHms4iTCRZ34lKZ1_FU,8507
+firstrade/symbols.py,sha256=tZD7jexvyvh1rTaOdAKv_vyZWzpjffvl_nPwBe1QaiA,3633
+firstrade/urls.py,sha256=OrfXGDsNpA2rTm4o55KAQzpeigG_pxufWyTDBlbhJYQ,1248
+firstrade-0.0.20.dist-info/LICENSE,sha256=wPEQjDqm5zMBmEcZp219Labmq_YIjhudpZiUzyVKaFA,1057
+firstrade-0.0.20.dist-info/METADATA,sha256=9Uhmo3S2cvYc5fyTpyACPxHTpCIS5p1GgBOqb2csZ-A,2399
+firstrade-0.0.20.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+firstrade-0.0.20.dist-info/top_level.txt,sha256=tdA8v-KDxU1u4VV6soiNWGBlni4ojv_t_j2wFn5nZcs,10
+firstrade-0.0.20.dist-info/RECORD,,

{firstrade-0.0.19.dist-info → firstrade-0.0.20.dist-info}/WHEEL

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

firstrade-0.0.19.dist-info/RECORD

@@ -1,10 +0,0 @@
-firstrade/__init__.py,sha256=fNiWYgSTjElY1MNv0Ug-sVLMTR2z_Ngri_FY7Pekdrw,95
-firstrade/account.py,sha256=xDgTMXDy2UWUNi4kboXAKKBrbmZGpXLJ11MCHlMvzB0,9218
-firstrade/order.py,sha256=BK2OmIOr_LO4SrNRVWjkydaoc_4fLkl6Rr7_LCRTyLE,7635
-firstrade/symbols.py,sha256=tZD7jexvyvh1rTaOdAKv_vyZWzpjffvl_nPwBe1QaiA,3633
-firstrade/urls.py,sha256=OrfXGDsNpA2rTm4o55KAQzpeigG_pxufWyTDBlbhJYQ,1248
-firstrade-0.0.19.dist-info/LICENSE,sha256=wPEQjDqm5zMBmEcZp219Labmq_YIjhudpZiUzyVKaFA,1057
-firstrade-0.0.19.dist-info/METADATA,sha256=apZ7RN0uTgzdVp90m3LeQyZcs34zBtWtUTFmxK7akFA,2399
-firstrade-0.0.19.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-firstrade-0.0.19.dist-info/top_level.txt,sha256=tdA8v-KDxU1u4VV6soiNWGBlni4ojv_t_j2wFn5nZcs,10
-firstrade-0.0.19.dist-info/RECORD,,