dukascript 0.0.0__py3-none-any.whl → 0.0.2__py3-none-any.whl

dukascript/__init__.py

@@ -7,8 +7,6 @@ import string
 from time import sleep
 import logging
 
-from .instruments import *
-
 TIME_UNIT_MONTH = "MONTH"
 TIME_UNIT_WEEK = "WEEK"
 TIME_UNIT_DAY = "DAY"
@@ -32,20 +30,20 @@ INTERVAL_SEC_10 = f"10{TIME_UNIT_SEC}"
 INTERVAL_SEC_1 = f"1{TIME_UNIT_SEC}"
 INTERVAL_TICK = TIME_UNIT_TICK
 
-INTERVALS_SET = {
-    INTERVAL_MONTH_1,
-    INTERVAL_WEEK_1,
-    INTERVAL_DAY_1,
-    INTERVAL_HOUR_4,
-    INTERVAL_HOUR_1,
-    INTERVAL_MIN_30,
-    INTERVAL_MIN_15,
-    INTERVAL_MIN_10,
-    INTERVAL_MIN_5,
-    INTERVAL_MIN_1,
-    INTERVAL_SEC_30,
-    INTERVAL_SEC_10,
-    INTERVAL_SEC_1,
+_interval_units = {
+    INTERVAL_MONTH_1:TIME_UNIT_MONTH,
+    INTERVAL_WEEK_1:TIME_UNIT_WEEK,
+    INTERVAL_DAY_1:TIME_UNIT_DAY,
+    INTERVAL_HOUR_4:TIME_UNIT_HOUR,
+    INTERVAL_HOUR_1:TIME_UNIT_HOUR,
+    INTERVAL_MIN_30:TIME_UNIT_MIN,
+    INTERVAL_MIN_15:TIME_UNIT_MIN,
+    INTERVAL_MIN_10:TIME_UNIT_MIN,
+    INTERVAL_MIN_5:TIME_UNIT_MIN,
+    INTERVAL_MIN_1:TIME_UNIT_MIN,
+    INTERVAL_SEC_30:TIME_UNIT_SEC,
+    INTERVAL_SEC_10:TIME_UNIT_SEC,
+    INTERVAL_SEC_1:TIME_UNIT_SEC,
 }
 
 OFFER_SIDE_BID = "B"
@@ -56,24 +54,9 @@ def _get_custom_logger(debug=False):
     logger = logging.getLogger("DUKASCRIPT")
     logger.setLevel(logging.DEBUG if debug else logging.INFO)
 
-    if not logger.handlers:
-        # Formatter
-        formatter = logging.Formatter("[%(levelname)s] %(message)s")
-
-        # Console Handler
-        ch = logging.StreamHandler()
-        ch.setLevel(logging.DEBUG if debug else logging.INFO)
-        ch.setFormatter(formatter)
-
-        logger.addHandler(ch)
-
     return logger
 
 
-def _is_valid_api_interval(interval):
-    return True if interval in INTERVALS_SET else False
-
-
 def _resample_to_nearest(
     timestamp: datetime,
     time_unit: str,
@@ -266,8 +249,7 @@ def _stream(
 
 def fetch(
     instrument: str,
-    interval_value: str,
-    time_unit: str,
+    interval: str,
     offer_side: str,
     start: datetime,
     end: datetime,
@@ -276,17 +258,11 @@ def fetch(
     debug=False,
 ):
     logger = _get_custom_logger(debug)
+    time_unit=_interval_units[interval]
     columns = _get_dataframe_columns_for_timeunit(time_unit)
 
     data = []
 
-    interval = (
-        time_unit if time_unit == TIME_UNIT_TICK else f"{interval_value}{time_unit}"
-    )
-
-    if not _is_valid_api_interval(interval):
-        raise ValueError("allowed intervals ", INTERVALS_SET)
-
     datafeed = _stream(
         instrument=instrument,
         interval=interval,

{dukascript-0.0.0.dist-info → dukascript-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dukascript
-Version: 0.0.0
+Version: 0.0.2
 Summary: Download tick data from Dukascopy Bank SA to local cache, and simulate time-ordered price streams
 Author-email: Eghosa Osayande <osayandeeghosam@gmail.com>
 License: MIT License

dukascript-0.0.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+dukascript/__init__.py,sha256=uKpjTfC7lEw8LRPHdXbEw2jyviA4mUhW2CoKJw412nE,11398
+dukascript/_instrument_generator.py,sha256=WDTNS1bLa-J2uI3TmoBTg-WCHdAtkX6d6tq0xhqL4GI,24848
+dukascript/instruments.py,sha256=OxKTWR8zx2sjaHtGtd81FsQwTdAMItjgUSojzuJ1waI,59069
+dukascript-0.0.2.dist-info/licenses/LICENSE,sha256=SA8D35cWkNTiEI71ATLBPTzWgFwjPNZLeloeBJrAJr4,1061
+dukascript-0.0.2.dist-info/METADATA,sha256=4mb_CxQLSNqAhflL7miHQVJQEKumZ5a-yJ4LBEDLQw0,2040
+dukascript-0.0.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+dukascript-0.0.2.dist-info/top_level.txt,sha256=h7GgEQykn3TuhHU4jJxZQ7oNjP_naNvjUwZAw6KU3VE,11
+dukascript-0.0.2.dist-info/RECORD,,

dukascript-0.0.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-dukascript/__init__.py,sha256=AkXcp_kk-CKJ-_A0lP6sb4EUsJ87qBe0-U8CrpN6Yjs,11846
-dukascript/_instrument_generator.py,sha256=WDTNS1bLa-J2uI3TmoBTg-WCHdAtkX6d6tq0xhqL4GI,24848
-dukascript/instruments.py,sha256=OxKTWR8zx2sjaHtGtd81FsQwTdAMItjgUSojzuJ1waI,59069
-dukascript-0.0.0.dist-info/licenses/LICENSE,sha256=SA8D35cWkNTiEI71ATLBPTzWgFwjPNZLeloeBJrAJr4,1061
-dukascript-0.0.0.dist-info/METADATA,sha256=VwPTAE7fk2cAW4C_X3NTVYiu9mzWDy-d21BXu7lm0hg,2040
-dukascript-0.0.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-dukascript-0.0.0.dist-info/top_level.txt,sha256=h7GgEQykn3TuhHU4jJxZQ7oNjP_naNvjUwZAw6KU3VE,11
-dukascript-0.0.0.dist-info/RECORD,,