jgtfx2console 0.4.4__tar.gz → 0.4.17__tar.gz

{jgtfx2console-0.4.4/jgtfx2console.egg-info → jgtfx2console-0.4.17}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: jgtfx2console
-Version: 0.4.4
+Version: 0.4.17
 Summary: PDS Services
 Home-page: https://github.com/jgwill/jgtfx2console
 Author: GUillaume Isabelle
 Author-email: Guillaume Isabelle <jgi@jgwill.com>
-License: MIT
 Project-URL: Homepage, https://github.com/jgwill/jgtfx2console
 Project-URL: Bug Tracker, https://github.com/jgwill/jgtfx2console/issues
-Keywords: data
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -17,9 +15,8 @@ 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.67
 Requires-Dist: tlid
-Requires-Dist: flask
 Provides-Extra: dev
 Requires-Dist: flake8<3.7.0,>=3.6.0; extra == "dev"
 Requires-Dist: isort<4.4.0,>=4.3.4; extra == "dev"

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/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.17"
 
 

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/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,13 @@ def main():
     str_user_id = user_id#args.l
     str_password = password#args.p
     str_url = url#args.u
+    
+    keep_bid_ask = args.keepbidask
+
+    #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 +128,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 +148,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 → jgtfx2console-0.4.17/jgtfx2console.egg-info}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: jgtfx2console
-Version: 0.4.4
+Version: 0.4.17
 Summary: PDS Services
 Home-page: https://github.com/jgwill/jgtfx2console
 Author: GUillaume Isabelle
 Author-email: Guillaume Isabelle <jgi@jgwill.com>
-License: MIT
 Project-URL: Homepage, https://github.com/jgwill/jgtfx2console
 Project-URL: Bug Tracker, https://github.com/jgwill/jgtfx2console/issues
-Keywords: data
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -17,9 +15,8 @@ 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.67
 Requires-Dist: tlid
-Requires-Dist: flask
 Provides-Extra: dev
 Requires-Dist: flake8<3.7.0,>=3.6.0; extra == "dev"
 Requires-Dist: isort<4.4.0,>=4.3.4; extra == "dev"

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/jgtfx2console.egg-info/requires.txt

@@ -1,8 +1,7 @@
 pandas>=0.25.1
 python-dotenv>=0.19.2
-jgtutils>=0.1.38
+jgtutils>=0.1.67
 tlid
-flask
 
 [dev]
 flake8<3.7.0,>=3.6.0

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jgtfx2console"
-version = "0.4.4"
+version = "0.4.17"
 authors = [
   { name="Guillaume Isabelle", email="jgi@jgwill.com" },
 ]
@@ -15,9 +15,8 @@ requires-python = ">=3.7"
 dependencies = [
   'pandas>=0.25.1',
   'python-dotenv>=0.19.2',
-  'jgtutils>=0.1.38',
-  'tlid',
-  'flask'
+  'jgtutils>=0.1.67',
+  'tlid'
 ]	
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -30,3 +29,7 @@ classifiers = [
 "Bug Tracker" = "https://github.com/jgwill/jgtfx2console/issues"
 
 
+
+
+[project.scripts]
+fxcli2console = "jgtfx2console.fxcli2console:main"

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-description-file = README.md
+description_file = README.md
 license_files = LICENSE
 
 [egg_info]

{jgtfx2console-0.4.4 → jgtfx2console-0.4.17}/setup.py

@@ -13,9 +13,9 @@ from jgtfx2console import __version__ as version
 INSTALL_REQUIRES = [
     'pandas>=0.25.1',
     'python-dotenv>=0.19.2',
-    'jgtutils>=0.1.38',
-    'tlid',
-    'flask'
+    'jgtutils>=0.1.67',
+    'tlid'
+
 ]
 
 EXTRAS_DEV_LINT = [
@@ -45,16 +45,16 @@ setup(
     packages=find_packages(include=['jgtfx2console', 'jgtfx2console.forexconnect', 'jgtfx2console.forexconnect.lib', 'jgtfx2console.forexconnect.lib.windows', 'jgtfx2console.forexconnect.lib.linux','jgtfx2console/**'], exclude=['*test*']),
     include_package_data=True,
     install_requires=INSTALL_REQUIRES,
-    entry_points={
-        'console_scripts': ['fxcli2console=jgtfx2console.fxcli2console:main'],
-    },
+    # entry_points={
+    #     'console_scripts': ['fxcli2console=jgtfx2console.fxcli2console:main'],
+    # },
     extras_require={
         'dev': (EXTRAS_DEV_LINT + EXTRAS_DEV_TEST + EXTRAS_DEV_DOCS),
         'dev-lint': EXTRAS_DEV_LINT,
         'dev-test': EXTRAS_DEV_TEST,
         'dev-docs': EXTRAS_DEV_DOCS,
     },
-    license='MIT',
+    #license='MIT',
     keywords='data',
     classifiers=[
         "Development Status :: 5 - Production/Stable",