jgtfx2console 0.4.4__py3-none-any.whl → 0.4.11__py3-none-any.whl

jgtfx2console/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Jean Guillaume Isabelle
+# Copyright 2024 Jean Guillaume Isabelle
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,6 +42,6 @@ with warnings.catch_warnings():
     # your code here
 
 
-__version__ = "0.4.4"
+__version__ = "0.4.11"
 
 

jgtfx2console/fxcli2console.py

@@ -43,7 +43,7 @@ connection = os.getenv('connection')
 quotes_count = os.getenv('quotes_count')
 
 #from jgtpy import jgtcommon as jgtcomm,iprops
-from jgtutils import jgtcommon as jgtcomm,iprops
+from jgtutils import jgtcommon as jgtcomm,iprops,jgtconstants as c
 
 ##import jgtcommon as jgtcomm,iprops
 
@@ -63,6 +63,7 @@ def parse_args():
     jgtcomm.add_tlid_range_argument(parser)
     #jgtcomm.add_date_arguments(parser)
     jgtcomm.add_max_bars_arguments(parser)
+    jgtcomm.add_keepbidask_argument(parser)
     args = parser.parse_args()
     return args
 
@@ -72,6 +73,15 @@ def main():
     str_user_id = user_id#args.l
     str_password = password#args.p
     str_url = url#args.u
+    
+    keep_bid_ask = args.keepbidask
+
+    # Do we have keep_bid_ask set to true?
+    config = jgtcomm.readconfig()
+    #env variable bypass if env exist JGT_KEEP_BID_ASK=1, keep_bid_ask = True
+    if os.getenv("JGT_KEEP_BID_ASK","0") == "1":
+        keep_bid_ask = True
+        
     using_tlid = False
     if args.tlidrange is not None:
       using_tlid= True
@@ -120,10 +130,15 @@ def main():
                     print("{0:s}, {1:,.5f}, {2:,.5f}".format(
                         pd.to_datetime(str(row['Date'])).strftime(date_format), row['Bid'], row['Ask']))
             else:
-                print("Date, Open, High, Low, Close, Median, Volume")
+                csv_header_OHLC = "Date,Open,High,Low,Close,Median,Volume"
+                csv_header_OHLCBIDASK="Date,BidOpen,BidHigh,BidLow,BidClose,AskOpen,AskHigh,AskLow,AskClose,Volume,Open,High,Low,Close,Median"
+                csv_header=csv_header_OHLC
+                if keep_bid_ask:
+                    csv_header=csv_header_OHLCBIDASK
+                print(csv_header)
                 rounder = lpip+1
                 for row in history:
-                    print(format_output(rounder,row,rounder,date_format))
+                    print(format_output(rounder,row,rounder,date_format,keep_bid_ask=keep_bid_ask))
                     
                     # print("{0:s},{1:.5f},{2:.5f},{3:.5f},{4:.5f},{5:.5f},{6:d}".format(                    
                     #     pd.to_datetime(str(row['Date'])).strftime(date_format), open_price, high_price,
@@ -135,15 +150,20 @@ def main():
         except Exception as e:
             jgtcomm.print_exception(e)
 
-def format_output(nb_decimal, row, rounder, date_format = '%Y-%m-%d %H:%M:%S'):
-    open_price = round(((row['BidOpen'] + row['AskOpen']) / 2), rounder)
-    high_price = round(((row['BidHigh'] + row['AskHigh']) / 2), rounder)
-    low_price = round(((row['BidLow'] + row['AskLow']) / 2), rounder)
-    close_price = round(((row['BidClose'] + row['AskClose']) / 2), rounder)
+def format_output(nb_decimal, row, rounder, date_format = '%Y-%m-%d %H:%M:%S',keep_bid_ask=False):
+    open_price = round(((row[c.BIDOPEN] + row[c.ASKOPEN]) / 2), rounder)
+    high_price = round(((row[c.BIDHIGH] + row[c.ASKHIGH]) / 2), rounder)
+    low_price = round(((row[c.BIDLOW] + row[c.ASKLOW]) / 2), rounder)
+    close_price = round(((row[c.BIDCLOSE] + row[c.ASKCLOSE]) / 2), rounder)
     median = round(((high_price + low_price) / 2), rounder)
-    dt_formatted=pd.to_datetime(str(row['Date'])).strftime(date_format)
+    dt_formatted=pd.to_datetime(str(row[c.DATE])).strftime(date_format)
     #print("dt formatted: " + dt_formatted)
-    formatted_string = f"{dt_formatted},{open_price:.{nb_decimal}f},{high_price:.{nb_decimal}f},{low_price:.{nb_decimal}f},{close_price:.{nb_decimal}f},{median:.{nb_decimal}f},{row['Volume']:d}"
+    #if keep_bid_ask:Date,BidOpen,BidHigh,BidLow,BidClose,AskOpen,AskHigh,AskLow,AskClose,Volume,Open,High,Low,Close,Median
+    if keep_bid_ask:
+        formatted_string = f"{dt_formatted},{row[c.BIDOPEN]:.{nb_decimal}f},{row[c.BIDHIGH]:.{nb_decimal}f},{row[c.BIDLOW]:.{nb_decimal}f},{row[c.BIDCLOSE]:.{nb_decimal}f},{row[c.ASKOPEN]:.{nb_decimal}f},{row[c.ASKHIGH]:.{nb_decimal}f},{row[c.ASKLOW]:.{nb_decimal}f},{row[c.ASKCLOSE]:.{nb_decimal}f},{row[c.VOLUME]:d},{open_price:.{nb_decimal}f},{high_price:.{nb_decimal}f},{low_price:.{nb_decimal}f},{close_price:.{nb_decimal}f},{median:.{nb_decimal}f}"
+    else:
+        formatted_string = f"{dt_formatted},{open_price:.{nb_decimal}f},{high_price:.{nb_decimal}f},{low_price:.{nb_decimal}f},{close_price:.{nb_decimal}f},{median:.{nb_decimal}f},{row['Volume']:d}"
+        
     return formatted_string
   
 def format_output1(nb_decimal, row, rounder,date_format = '%Y-%m-%d %H:%M:%S'):

{jgtfx2console-0.4.4.dist-info → jgtfx2console-0.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jgtfx2console
-Version: 0.4.4
+Version: 0.4.11
 Summary: PDS Services
 Home-page: https://github.com/jgwill/jgtfx2console
 Author: GUillaume Isabelle
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas >=0.25.1
 Requires-Dist: python-dotenv >=0.19.2
-Requires-Dist: jgtutils >=0.1.38
+Requires-Dist: jgtutils >=0.1.58
 Requires-Dist: tlid
 Requires-Dist: flask
 Provides-Extra: dev

{jgtfx2console-0.4.4.dist-info → jgtfx2console-0.4.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jgtfx2console/__init__.py,sha256=gC3JXMdLTNI_CS3mG6wBHEMqNdMyWlD66TGD_uT77S8,1610
-jgtfx2console/fxcli2console.py,sha256=rq6LQ2PBanrxWOWUKYdF_nVp3Oj3cXV8ils3AvfOwu4,6180
+jgtfx2console/__init__.py,sha256=wFmXCnNb_4KRs5g1bdCrmtW53wI7baYO7OU-WLm2CFY,1611
+jgtfx2console/fxcli2console.py,sha256=FoSSrfNoU9trLgg-sFFqob7uaQdGhEeReqi5lXHscqk,7503
 jgtfx2console/forexconnect/EachRowListener.py,sha256=jbRaSqhHtoaRnEnLGoUmVLvE6VPt-WXYtglRPzK440k,1649
 jgtfx2console/forexconnect/ForexConnect.py,sha256=Yf6AcLdgMSD8rd1s2DTIJPfzJ7BljIaZy_8vTfPfSOI,25755
 jgtfx2console/forexconnect/LiveHistory.py,sha256=saGkZ8ZUWRclcusG1vg12H4flpQWXKIMXCdQ5qM5cOo,9925
@@ -29,9 +29,9 @@ jgtfx2console/forexconnect/lib/linux/libpython3.7m.so,sha256=UQzwU5QcaVnwQdt2yXi
 jgtfx2console/forexconnect/lib/linux/libquotesmgr2.so.2.8,sha256=QIUMvjI-4m3YX3N23Pad9TIhYbmk17raTTW0gyrElkM,1245248
 jgtfx2console/forexconnect/lib/linux/libsqlite3.8.so,sha256=aqjV6ZcluDkzyr_bbWQCOHt9uitLvp7uPS-53Z3toQk,641120
 jgtfx2console/forexconnect/lib/linux/requirements.txt,sha256=62zntle4oq_jlsvrAK1bbfgYvAcRPtVHkGYu_eWiRZs,77
-jgtfx2console-0.4.4.dist-info/LICENSE,sha256=uCA_HysYVK9qIMbDEFjcDYhCoKTg19AJhKhM71EKSGA,1086
-jgtfx2console-0.4.4.dist-info/METADATA,sha256=gCalRCtL4EXb1Qwis7SS0SoeTXwd-IezldBK4u4qFOo,2249
-jgtfx2console-0.4.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-jgtfx2console-0.4.4.dist-info/entry_points.txt,sha256=Jm1hD4oYLEKFNd6w7Ky7saQnSZGgbh6IEI7rpqCuMVs,67
-jgtfx2console-0.4.4.dist-info/top_level.txt,sha256=PBNCBgqX42I7ctUTX9FcTnIX0utvgRqzuflefzZ30D8,14
-jgtfx2console-0.4.4.dist-info/RECORD,,
+jgtfx2console-0.4.11.dist-info/LICENSE,sha256=uCA_HysYVK9qIMbDEFjcDYhCoKTg19AJhKhM71EKSGA,1086
+jgtfx2console-0.4.11.dist-info/METADATA,sha256=2K5VpMahi7QteEVR35BOBUeSegi63iUsZtNd7IM23J8,2250
+jgtfx2console-0.4.11.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+jgtfx2console-0.4.11.dist-info/entry_points.txt,sha256=Jm1hD4oYLEKFNd6w7Ky7saQnSZGgbh6IEI7rpqCuMVs,67
+jgtfx2console-0.4.11.dist-info/top_level.txt,sha256=PBNCBgqX42I7ctUTX9FcTnIX0utvgRqzuflefzZ30D8,14
+jgtfx2console-0.4.11.dist-info/RECORD,,