onetick-py 1.162.2__py3-none-any.whl → 1.164.0__py3-none-any.whl

onetick/py/run.py

@@ -494,7 +494,7 @@ def run(query: Union[Callable, Dict, otp.Source, otp.MultiOutputSource,  # NOSON
         query = otp.MultiOutputSource(query)
 
     params_saved_to_otq = {}
-    if isinstance(query, otp.Source) or isinstance(query, otp.MultiOutputSource):
+    if isinstance(query, (otp.Source, otp.MultiOutputSource)):
         start = None if start is utils.adaptive else start
         end = None if end is utils.adaptive else end
         params_saved_to_otq = dict(
@@ -660,9 +660,9 @@ def _form_dict_from_list(data_list, output_structure):
         d = defaultdict(list)
         for node, df in lst:
             d[node].append(df)
-        for node in d.keys():  # noqa
-            if len(d[node]) == 1:
-                d[node] = d[node][0]
+        for node, node_list in d.items():
+            if len(node_list) == 1:
+                d[node] = node_list[0]
         if len(d) == 1:
             d = list(d.values())[0]
         else:  # converting defaultdict to regular dict
@@ -671,7 +671,7 @@ def _form_dict_from_list(data_list, output_structure):
 
     def get_dataframe(data):
         if output_structure == 'df':
-            return pd.DataFrame({col_name: col_value for col_name, col_value in data})
+            return pd.DataFrame(dict(data))
         else:
             import polars
             if isinstance(data, polars.DataFrame):
@@ -749,7 +749,7 @@ def _process_empty_results(result, query_schema, output_structure):
         (field, np.array([], dtype=otp.types.type2np(dtype)))
         for field, dtype in {**query_schema, 'Time': otp.nsectime}.items()
     ]
-    if type(result) is otq.SymbolNumpyResultMap:
+    if isinstance(result, otq.SymbolNumpyResultMap):
         empty_data = dict(schema)
     else:
         empty_data = schema
@@ -758,7 +758,7 @@ def _process_empty_results(result, query_schema, output_structure):
         import polars
         empty_data = polars.DataFrame(dict(schema))
 
-    if type(result) is otq.SymbolNumpyResultMap:
+    if isinstance(result, otq.SymbolNumpyResultMap):
         for result_item in result.get_dict().values():
             for node_name, symbol_result in result_item.items():
                 if len(symbol_result[0]) == 0:
@@ -814,6 +814,7 @@ def _get_start_end(start, end, timezone):
 
     # `isinstance(obj, datetime.date)` is not correct because
     # isinstance(<datetime.datetime object>, datetime.date) = True
+    # pylint: disable=unidiomatic-typecheck
     if type(start) is datetime.date:
         start = datetime.datetime(start.year, start.month, start.day)
     if type(end) is datetime.date:

onetick/py/servers.py

@@ -1,4 +1,4 @@
-from typing import Optional, Union, List
+from typing import Optional, Union
 
 
 class RemoteTS:
@@ -96,7 +96,7 @@ class RemoteTS:
         return self.__str__()
 
     def __str__(self):
-        if isinstance(self._host, FaultTolerance) or isinstance(self._host, LoadBalancing):
+        if isinstance(self._host, (FaultTolerance, LoadBalancing)):
             return str(self._host)
         url = f'{self._host}:{self._port}'
         if self._protocol:

onetick/py/session.py

@@ -16,7 +16,7 @@ from . import utils
 from . import license as _license
 from . import db as _db
 from . import servers as _servers
-from .configuration import config
+from . import configuration
 from .db._inspection import databases as _databases
 
 
@@ -320,6 +320,7 @@ class ACL(_FileHandler):
     def reload(self, db=None):
         if self._session_ref is not None:
             return utils.reload_config(db, config_type='ACCESS_LIST')
+        return None
 
     def _read_dbs(self):
         get_db = GetAll()
@@ -433,6 +434,7 @@ class Locator(_FileHandler):
     def reload(self, db_=None):
         if self._session_ref is not None:
             return utils.reload_config(db_, config_type='LOCATOR')
+        return None
 
     def _apply_actions(self, actions, print_writer=False):
         writer = PrintWriter() if print_writer else FileWriter(self.path)
@@ -1300,11 +1302,11 @@ class TestSession(Session):
         ``DEMO_L1`` is the database defined in the default locator generated by onetick.py
         and it is also a name of the database commonly used in the OneTick ecosystem, academy courses, etc.
         """
-        config['tz'] = 'EST5EDT'
-        config['default_db'] = 'DEMO_L1'
-        config['default_symbol'] = 'AAPL'
-        config['default_start_time'] = datetime(2003, 12, 1, 0, 0, 0)
-        config['default_end_time'] = datetime(2003, 12, 4, 0, 0, 0)
+        configuration.config['tz'] = 'EST5EDT'
+        configuration.config['default_db'] = 'DEMO_L1'
+        configuration.config['default_symbol'] = 'AAPL'
+        configuration.config['default_start_time'] = datetime(2003, 12, 1, 0, 0, 0)
+        configuration.config['default_end_time'] = datetime(2003, 12, 4, 0, 0, 0)
         super().__init__(*args, **kwargs)
 
 

onetick/py/sources/common.py

@@ -17,25 +17,27 @@ AdaptiveDBType = Union[str, OnetickParameter, _SymbolParamColumn, Type[utils.ada
 
 
 def get_start_end_by_date(date):
-    if isinstance(date, ott.datetime) or isinstance(date, ott.date):
+    if isinstance(date, (ott.datetime, ott.date)):
         start = date.start
         end = date.end
-    if isinstance(date, dt.datetime) or isinstance(date, dt.date):
+    elif isinstance(date, (dt.datetime, dt.date)):
         start = dt.datetime(date.year, date.month, date.day)
         end = start + dt.timedelta(days=1, milliseconds=-1)
+    else:
+        raise ValueError(f"Unsupported value of parameter 'date': {type(date)}")
     return start, end
 
 
 def convert_tick_type_to_str(
     tick_type: Optional[AdaptiveTickType],
     db: Optional[AdaptiveDBType] = None,
-):
+) -> Optional[str]:
     if not isinstance(db, list) and not isinstance(db, (OnetickParameter, _SymbolParamColumn)):
         if tick_type is utils.adaptive:
             tick_type = 'ANY'
 
         if isinstance(tick_type, type) or tick_type is None:
-            return
+            return None
 
     if db is utils.adaptive_to_default or db is utils.adaptive:
         # if default database is not set, tick type will be set without it

onetick/py/sources/data_source.py

@@ -329,8 +329,7 @@ class DataSource(Source):
             start = None  # means that use the last date with data
 
         if isinstance(db, list):
-            ''' This case of a merge, since we need to get combined schema
-            across different tick types and dbs '''
+            # This case of a merge, since we need to get combined schema across different tick types and dbs
             for t_db in db:
                 if t_db.startswith('expr('):
                     continue
@@ -358,8 +357,8 @@ class DataSource(Source):
                 schema.update(db_schema)
 
         if db is None or isinstance(db, _SymbolParamColumn):
-            ''' In this case we can't get schema, because db is calculated dynamically.
-            Set to empty to indicate that in this case we expect the manually set schema. '''
+            # In this case we can't get schema, because db is calculated dynamically.
+            # Set to empty to indicate that in this case we expect the manually set schema.
             schema = {}
         return schema
 
@@ -430,22 +429,20 @@ class DataSource(Source):
 
     def __prepare_db_tick_type(self, db, tick_type, start, end):
         if isinstance(db, list):
-            ''' If everything is correct then this branch should leave
-            the `db` var as a list of databases with tick types and the
-            `tick_type` var is None.
-            Valid cases:
-                - Fully defined case. The `db` parameter has a list of databases where
-                  every database has a tick type, when the `tick_type`
-                  parameter has default value or None (for backward compatibility)
-                - Partially defined case. The `db` parameter has a list of databases but
-                  not every database has a tick type, and meantime the `tick_type`
-                  is passed to not None value. In that case databases without tick type
-                  are exetended with a tick type from the `tick_type` parameter
-                - No defined case. The `db` parameter has a list of databases and
-                  every database there has no tick type, and the `tick_type` is
-                  set to not None value. In that case every database is extended with
-                  the tick type from the `tick_type`.
-            '''
+            # If everything is correct then this branch should leave
+            # the `db` var as a list of databases with tick types and the `tick_type` var is None.
+            # Valid cases:
+            #     - Fully defined case. The `db` parameter has a list of databases where
+            #       every database has a tick type, when the `tick_type`
+            #       parameter has default value or None (for backward compatibility)
+            #     - Partially defined case. The `db` parameter has a list of databases but
+            #       not every database has a tick type, and meantime the `tick_type`
+            #       is passed to not None value. In that case databases without tick type
+            #       are exetended with a tick type from the `tick_type` parameter
+            #     - No defined case. The `db` parameter has a list of databases and
+            #       every database there has no tick type, and the `tick_type` is
+            #       set to not None value. In that case every database is extended with
+            #       the tick type from the `tick_type`.
 
             def db_converter(_db):
                 if isinstance(_db, DB):
@@ -483,8 +480,8 @@ class DataSource(Source):
             db = db.name  # ... and we go to the next branch
 
         if isinstance(db, str):
-            ''' The resulting `db` var contains a list with string value, that has the `db`
-            concatenated with the `tick_type`. '''
+            # The resulting `db` var contains a list with string value, that has the `db`
+            # concatenated with the `tick_type`.
             if '::' in db:
                 if tick_type is utils.adaptive or tick_type is None:
                     tick_type = db.split(':')[-1]
@@ -549,9 +546,8 @@ class DataSource(Source):
             tick_type = None
 
         if isinstance(db, _SymbolParamColumn):
-            ''' Do nothing, because we don't know whether db will come with the tick
-            type or not. The only one thing that definetely we know that tick_type
-            can not be utils.adpative '''
+            # Do nothing, because we don't know whether db will come with the tick type or not.
+            # The only one thing that definetely we know that tick_type can not be utils.adaptive
             if tick_type is utils.adaptive:
                 # TODO: need to test this case
                 raise ValueError('The `db` is set to the symbol param, in that case '
@@ -559,8 +555,7 @@ class DataSource(Source):
                                  'or to None')
 
         if db is None:
-            ''' This case means that database comes with the symbol name, then tick type
-            should be defined '''
+            # This case means that database comes with the symbol name, then tick type should be defined
             if tick_type is utils.adaptive or tick_type is None:
                 raise ValueError('The `db` is not specified that means database is '
                                  'expected to be defined with the symbol name. '
@@ -889,14 +884,9 @@ class DataSource(Source):
         )
 
         if (
-            isinstance(symbol, Source)
+            isinstance(symbol, (Source, query, _QueryEvalWrapper, otq.GraphQuery))
             or hasattr(symbol, "__iter__")
-            and not isinstance(symbol, dict)
-            and not isinstance(symbol, str)
-            and not isinstance(symbol, (OnetickParameter, _SymbolParamColumn))
-            or isinstance(symbol, query)
-            or isinstance(symbol, _QueryEvalWrapper)
-            or isinstance(symbol, otq.GraphQuery)
+            and not isinstance(symbol, (dict, str, OnetickParameter, _SymbolParamColumn))
         ):
             super().__init__(
                 _start=start,
@@ -965,7 +955,7 @@ class DataSource(Source):
         if where_clause_for_back_ticks is not None:
             params['where_clause_for_back_ticks'] = where_clause_for_back_ticks
 
-        if isinstance(db, list) or isinstance(db, _SymbolParamColumn):
+        if isinstance(db, (list, _SymbolParamColumn)):
             src = self._create_source(otq.Passthrough(**params),
                                       back_to_first_tick=back_to_first_tick,
                                       keep_first_tick_timestamp=keep_first_tick_timestamp)

onetick/py/sources/query.py

@@ -70,9 +70,9 @@ class Query(Source):
             schema=schema, **kwargs,
         )
 
-    def base_ep(self, query, out_pin):
-        nested = otq.NestedOtq(query.path, query.str_params)
-        graph = query.graph_info
+    def base_ep(self, query_object, out_pin):
+        nested = otq.NestedOtq(query_object.path, query_object.str_params)
+        graph = query_object.graph_info
 
         if out_pin is utils.adaptive:
             if graph is not None:
@@ -80,7 +80,7 @@ class Query(Source):
                     return Source(nested[graph.nested_outputs[0].NESTED_OUTPUT])
                 if len(graph.nested_outputs) > 1:
                     raise ValueError(
-                        f'Query "{query.query_name}" has multiple outputs, but you have not '
+                        f'Query "{query_object.query_name}" has multiple outputs, but you have not '
                         "specified which one should be used. You could specify it"
                         ' using "out_pin" parameter of the Query constructor.'
                     )
@@ -91,7 +91,7 @@ class Query(Source):
             existed_out_pins = set(map(operator.attrgetter("NESTED_OUTPUT"), graph.nested_outputs))
             if out_pin not in existed_out_pins:
                 raise ValueError(
-                    f'Query "{query.query_name}" does not have the "{out_pin}" output, there are only following '
+                    f'Query "{query_object.query_name}" does not have the "{out_pin}" output, there are only following '
                     f"output pins exist: {','.join(existed_out_pins)}"
                 )
         return Source(nested[out_pin])
@@ -369,7 +369,7 @@ class query:
         def __getitem__(self, key):
             output_pins = []
 
-            if type(key) is tuple:
+            if isinstance(key, tuple):
                 output_pins = list(key)
             elif isinstance(key, str):
                 output_pins = [key]
@@ -459,7 +459,7 @@ class query:
                 open_char = None
                 continue
 
-            if not open_char and (c == "'" or c == '"'):
+            if not open_char and c in ("'", '"'):
                 open_char = c
                 last_inx = inx + 1
                 continue

onetick/py/sources/symbols.py

@@ -271,7 +271,7 @@ class Symbols(Source):
                           " and use parameter '_tick_type' if you want set a tick type for a node in OneTick graph.",
                           FutureWarning, stacklevel=2)
 
-        if date and (isinstance(date, ott.datetime) or isinstance(date, ott.date)):
+        if date and isinstance(date, (ott.datetime, ott.date)):
             start = date.start
             end = date.end
 

onetick/py/sources/ticks.py

@@ -817,9 +817,9 @@ def TTicks(data):  # NOSONAR
                   "You could use the `Ticks` to pass data in the same format there",
                   FutureWarning)
 
-    dt = {}
+    data_dict = {}
 
     for inx, key in enumerate(data[0]):
-        dt[key] = [sub_list[inx] for sub_list in data[1:]]
+        data_dict[key] = [sub_list[inx] for sub_list in data[1:]]
 
-    return Ticks(dt)
+    return Ticks(data_dict)

onetick/py/state.py

@@ -59,6 +59,7 @@ def var(default_value, scope="query"):
     elif ott.is_time_type(dtype):
         dtype = ott.nsectime
 
+    # pylint: disable-next=unidiomatic-typecheck
     if type(default_value) is str:
         if len(default_value) > ott.string.DEFAULT_LENGTH:
             dtype = ott.string[len(default_value)]

onetick/py/types.py

@@ -1,7 +1,6 @@
 import ctypes
 import functools
 import inspect
-import os
 import warnings
 from typing import Optional, Type, Union
 from packaging.version import parse as parse_version
@@ -520,7 +519,7 @@ class _inner_string(type):
     @functools.lru_cache(maxsize=None)  # noqa: W1518
     def __getitem__(cls, item):
 
-        if (type(item) is not int or item < 1) and item is not Ellipsis:
+        if (not isinstance(item, int) or item < 1) and item is not Ellipsis:
             raise TypeError("It is not allowed to have non numeric index")
 
         class _inner_str(string):  # type: ignore[misc]
@@ -847,6 +846,7 @@ def get_object_type(obj):
         return dtype
     if is_time_type(obj):
         return nsectime
+    # pylint: disable-next=unidiomatic-typecheck
     if type(obj) is int and obj > long.MAX:
         # by default we use python's int (onetick's long) for numbers
         # in case the number is too big, let's use onetick's ulong
@@ -917,6 +917,7 @@ def get_type_by_objects(objs):
         dtype = nsectime
 
     # we assume the None value has float default value, ie NaN
+    # pylint: disable-next=unidiomatic-typecheck
     if type(None) is dtype:
         dtype = float
 
@@ -1271,7 +1272,7 @@ class datetime(AbstractTime):
         return result
 
     def _error_on_int_param(self, other, op):
-        if type(other) is int:
+        if isinstance(other, int):
             raise TypeError(f"unsupported operand type(s) for {op}: 'otp.datetime' and 'int'")
 
     def __str__(self):
@@ -1735,7 +1736,7 @@ def str2type(type_name: str):
 
 def type2np(t):
     if issubclass(t, str):
-        if issubclass(t, otp.string) and type(t.length) is int:
+        if issubclass(t, otp.string) and isinstance(t.length, int):
             return '<U' + str(t.length)
         return '<U64'
     elif issubclass(t, bool):
@@ -1774,27 +1775,27 @@ def type2np(t):
 
 # TODO: move this union of types to some common place
 def datetime2expr(
-    dt: Union[_datetime, _date, pd.Timestamp, date, datetime],
+    dt_obj: Union[_datetime, _date, pd.Timestamp, date, datetime],
     timezone: Optional[str] = None,
     timezone_naive: Optional[str] = None,
 ) -> str:
     """
     Convert python datetime values to OneTick string representation.
-    If `dt` is timezone-aware then timezone will be taken from `dt` value.
-    If `dt` is timezone-naive then timezone specified with otp.config['tz'] or otp.run() will be used.
+    If ``dt_obj`` is timezone-aware then timezone will be taken from ``dt_obj`` value.
+    If ``dt_obj`` is timezone-naive then timezone specified with otp.config['tz'] or otp.run() will be used.
 
     Parameters
     ----------
-    dt
+    dt_obj
         date or datetime value
     timezone: str or Operation
         This timezone will be used unconditionally.
     timezone_naive: str or Operation
-        This timezone will be used if `dt` is timezone-naive.
+        This timezone will be used if ``dt_obj`` is timezone-naive.
     """
-    dt_str = _format_datetime(dt, '%Y-%m-%d %H:%M:%S.%f', add_nano_suffix=True)
+    dt_str = _format_datetime(dt_obj, '%Y-%m-%d %H:%M:%S.%f', add_nano_suffix=True)
     if timezone is None:
-        timezone = get_timezone_from_datetime(dt)
+        timezone = get_timezone_from_datetime(dt_obj)
     if timezone is None:
         timezone = timezone_naive
     if not isinstance(timezone, otp.Operation):
@@ -1802,16 +1803,16 @@ def datetime2expr(
     return f'PARSE_NSECTIME("%Y-%m-%d %H:%M:%S.%J", "{dt_str}", {str(timezone)})'
 
 
-def datetime2timeval(dt: Union[_datetime, _date, pd.Timestamp, date, datetime], timezone: str = 'GMT'):
+def datetime2timeval(dt_obj: Union[_datetime, _date, pd.Timestamp, date, datetime], timezone: str = 'GMT'):
     """
     Get nanosecond-precision pyomd.timeval_t
     from different datetime types supported by onetick-py.
 
-    If ``dt`` is timezone-aware, then its timezone will be used.
-    If ``dt`` is timezone-naive , then it will be localized to ``timezone`` parameter (GMT by default).
+    If ``dt_obj`` is timezone-aware, then its timezone will be used.
+    If ``dt_obj`` is timezone-naive , then it will be localized to ``timezone`` parameter (GMT by default).
     """
-    dt_str = _format_datetime(dt, '%Y-%m-%d %H:%M:%S.%f', add_nano_suffix=True)
-    tz_str = get_timezone_from_datetime(dt)
+    dt_str = _format_datetime(dt_obj, '%Y-%m-%d %H:%M:%S.%f', add_nano_suffix=True)
+    tz_str = get_timezone_from_datetime(dt_obj)
     if tz_str:
         # use timezone from the object
         return pyomd.TimeParser('%Y-%m-%d %H:%M:%S.%J', tz_str).parse_time(dt_str)
@@ -1820,11 +1821,11 @@ def datetime2timeval(dt: Union[_datetime, _date, pd.Timestamp, date, datetime],
         return pyomd.TimeParser('%Y-%m-%d %H:%M:%S.%J', timezone).parse_time(dt_str)
 
 
-def _format_datetime(dt, fmt, add_nano_suffix=True):
-    dt_str = dt.strftime(fmt)
+def _format_datetime(dt_obj, fmt, add_nano_suffix=True):
+    dt_str = dt_obj.strftime(fmt)
     if add_nano_suffix:
-        if isinstance(dt, (pd.Timestamp, datetime)):
-            dt_str += f'{dt.nanosecond:03}'[-3:]
+        if isinstance(dt_obj, (pd.Timestamp, datetime)):
+            dt_str += f'{dt_obj.nanosecond:03}'[-3:]
         else:
             dt_str += '000'
     return dt_str
@@ -1933,15 +1934,15 @@ def is_time_type(time):
     return issubclass(time, (_date, datetime, date))
 
 
-def next_day(dt: Union[_date, _datetime, date, datetime, pd.Timestamp]) -> _datetime:
+def next_day(dt_obj: Union[_date, _datetime, date, datetime, pd.Timestamp]) -> _datetime:
     """
-    Return next day of `dt` as datetime.datetime.
+    Return next day of ``dt_obj`` as datetime.datetime.
     """
-    updated_dt = dt + Day(1)
+    updated_dt = dt_obj + Day(1)
 
     # If we switch ts on timezone transition time, ts changes its timezone offset
-    if hasattr(dt, "tzinfo") and updated_dt.tzinfo != dt.tzinfo:
-        dt_offset = dt.tzinfo.utcoffset(dt)
+    if hasattr(dt_obj, "tzinfo") and updated_dt.tzinfo != dt_obj.tzinfo:
+        dt_offset = dt_obj.tzinfo.utcoffset(dt_obj)
         updated_dt_offset = updated_dt.tzinfo.utcoffset(updated_dt)
 
         tz_diff = dt_offset - updated_dt_offset
@@ -2005,6 +2006,7 @@ def default_by_type(dtype):
         return dtype('')
     if issubclass(dtype, nsectime) or issubclass(dtype, msectime):
         return dtype(0)
+    raise TypeError(f"Can't get default value for type: {dtype}")
 
 
 class timedelta(pd.Timedelta):

onetick/py/utils/config.py

@@ -8,7 +8,7 @@ from onetick.py.otq import otq
 
 from .temp import TmpFile, TmpDir, ONE_TICK_TMP_DIR
 from ..core import db_constants
-from .types import default
+from . import types
 
 
 def reload_config(db=None, config_type='LOCATOR'):
@@ -113,7 +113,7 @@ def tmp_config(
     acl=None,
     otq_path=None,
     csv_path=None,
-    clean_up=default,
+    clean_up=types.default,
     license_path=None,
     license_dir=None,
     license_servers=None,

onetick/py/utils/perf.py

@@ -15,7 +15,7 @@ from onetick.py.core import query_inspector
 from . import adaptive
 
 
-if otp.__webapi__ or os.getenv("OTP_SKIP_OTQ_VALIDATION", False):
+if otp.__webapi__ or os.getenv("OTP_SKIP_OTQ_VALIDATION"):
     MEASURE_PERF = None
 else:
     # see http://solutions.pages.soltest.onetick.com/iac/onetick-server/MeasurePerf.html
@@ -294,8 +294,7 @@ class PerformanceSummary:
         """
         Iterate over list of summary :attr:`entries`.
         """
-        for entry in self.entries:
-            yield entry
+        yield from self.entries
 
 
 class OrdinarySummary(PerformanceSummary):

onetick/py/utils/temp.py

@@ -26,8 +26,8 @@ def default_clean_up(clean_up):
 
 
 def get_logger(*args):
-    from ..log import get_logger
-    return get_logger(__name__, *args)
+    from .. import log
+    return log.get_logger(__name__, *args)
 
 
 class CleanUpFinalizer:

{onetick_py-1.162.2.dist-info → onetick_py-1.164.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onetick-py
-Version: 1.162.2
+Version: 1.164.0
 Summary: Python package that allows you to work with OneTick
 Author-email: solutions <solutions@onetick.com>
 License-Expression: MIT