onetick-py 1.167.0__tar.gz → 1.168.0__tar.gz

{onetick_py-1.167.0 → onetick_py-1.168.0}/PKG-INFO

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

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick/lib/instance.py

@@ -5,7 +5,7 @@ import gc
 import inspect
 from enum import Enum
 
-if os.getenv("OTP_WEBAPI"):
+if os.getenv('OTP_WEBAPI', default='').lower() not in ('0', 'false', 'no', ''):
     import onetick.query_webapi as otq
 
     class OneTickLibMock:

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick/py/__init__.py

@@ -2,7 +2,7 @@
 import os
 from . import _version
 __version__ = _version.VERSION
-__webapi__: bool = bool(os.getenv("OTP_WEBAPI"))
+__webapi__: bool = os.getenv('OTP_WEBAPI', default='').lower() not in ('0', 'false', 'no', '')
 
 
 def __validate_onetick_query_integration():  # noqa
@@ -77,7 +77,8 @@ def __validate_onetick_query_integration():  # noqa
     if _otq_import_ex is None:
         return
 
-    # webapi is installed to pip and OTP_WEBAPI=1, we don't need to raise any exception
+    # PY-1033: if we can't import onetick.query, but can import onetick.query_webapi
+    # then we can just use it and don't need to raise any exception (even if OTP_WEBAPI is not set)
     try:
         import onetick.query_webapi
         __webapi__ = True

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick/py/_version.py

@@ -1,2 +1,2 @@
 # This file was generated automatically. DO NOT CHANGE.
-VERSION = '1.167.0'
+VERSION = '1.168.0'

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick/py/compatibility.py

@@ -758,3 +758,12 @@ def is_include_market_order_ticks_supported(**kwargs):
     return _is_min_build_or_version(1.25, 20241229055942,
                                     20240812120000, min_update_number=2,
                                     **kwargs)
+
+
+def is_join_with_query_symbol_time_otq_supported():
+    # 20241209: Fixed 0034770: hours/minutes/seconds part of otq parameter _SYMBOL_TIME, expressed in
+    # milliseconds since 1970/01/01 00:00:00 GMT, is ignored
+    # 20250219: Implemented 0035092: passing otq param _SYMBOL_TIME should be just like setting symbol_date
+    # to the equivalent value, except in YYYYMMDDhhmmss format
+    return _is_min_build_or_version(None, None,
+                                    20250227120000)

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick/py/core/_source/source_methods/joins.py

@@ -14,6 +14,7 @@ from onetick.py.core.eval_query import prepare_params
 from onetick.py.otq import otq
 from onetick.py.compatibility import (
     is_supported_point_in_time,
+    is_join_with_query_symbol_time_otq_supported,
     is_join_with_snapshot_snapshot_fields_parameter_supported,
 )
 
@@ -72,6 +73,19 @@ def _columns_to_params_for_joins(columns, query_params=False):
             else:
                 raise ValueError('Parameter symbol_time has to be a datetime value!')
 
+        elif key == '_SYMBOL_TIME' and query_params:
+            # hack to support passing _SYMBOL_TIME to called query as a parameter
+            if dtype is otp.nsectime:
+                convert_rule += get_msecs_expression(ott.value2str(value))
+            elif dtype is str:
+                ns = f'PARSE_NSECTIME("%Y%m%d%H%M%S", {ott.value2str(value)}, _TIMEZONE)'
+                convert_rule += get_msecs_expression(ns)
+            elif dtype is otp.msectime:
+                # for backward compatibility
+                convert_rule += get_msecs_expression(value)
+            else:
+                raise ValueError('Parameter symbol_time has to be a datetime value!')
+
         elif dtype is str:
             if are_strings(getattr(value, "dtype", None)):
                 convert_rule += str(value)
@@ -80,17 +94,7 @@ def _columns_to_params_for_joins(columns, query_params=False):
         elif dtype is otp.msectime:
             convert_rule += get_msecs_expression(value)
         elif dtype is otp.nsectime:
-            if key == '_SYMBOL_TIME' and query_params:
-                # hack to support passing _SYMBOL_TIME to called query as a parameter
-                warnings.warn(
-                    'Query parameter _SYMBOL_TIME passed to join_with_query! '
-                    'This is deprecated. Please use a dedicated `symbol_time` parameter of the '
-                    'join_with_query function',
-                    FutureWarning,
-                    stacklevel=3,
-                )
-                convert_rule += get_msecs_expression(value)
-            elif query_params:
+            if query_params:
                 # this can be used for query params but cannot be used for symbol params
                 # overall it's better
                 convert_rule += "'NSECTIME('+tostring(NSECTIME_TO_LONG(" + str(value) + "))+')'"
@@ -672,10 +676,10 @@ def join_with_query(
     Function object as query is also supported (Note it will be executed only once in python's code):
 
     >>> def func(symbol):
-    ...    d = otp.Ticks(TYPE=["six"])
-    ...    d = d.update(dict(TYPE="three"), where=(symbol.name == "3"))  # symbol is always converted to string
-    ...    d["TYPE"] = symbol['PREF'] + d["TYPE"] + symbol['POST']
-    ...    return d
+    ...     d = otp.Ticks(TYPE=["six"])
+    ...     d = d.update(dict(TYPE="three"), where=(symbol.name == "3"))  # symbol is always converted to string
+    ...     d["TYPE"] = symbol['PREF'] + d["TYPE"] + symbol['POST']
+    ...     return d
     >>> # OTdirective: snippet-name: Special functions.join with query.with a function
     >>> data = otp.Ticks(A=[1, 2], B=[2, 4])
     >>> res = data.join_with_query(func, how='inner', symbol=(data['A'] + data['B'], dict(PREF="_", POST="$")))
@@ -689,9 +693,9 @@ def join_with_query(
     accessible through the "symbol" object:
 
     >>> def func(symbol):
-    ...    d = otp.Ticks(TYPE=["six"])
-    ...    d["TYPE"] = symbol['PREF'] + d["TYPE"] + symbol['POST']
-    ...    return d
+    ...     d = otp.Ticks(TYPE=["six"])
+    ...     d["TYPE"] = symbol['PREF'] + d["TYPE"] + symbol['POST']
+    ...     return d
     >>> # OTdirective: snippet-name: 'Source' operations.join with query.source as symbol;
     >>> data = otp.Ticks(A=[1, 2], B=[2, 4], PREF=["_", "$"], POST=["$", "_"])
     >>> res = data.join_with_query(func, how='inner', symbol=data)
@@ -834,22 +838,20 @@ def join_with_query(
             'object (dict or Source), or a tuple containing both'
         )
 
-    # adding symbol time
     if '_PARAM_SYMBOL_TIME' in converted_symbol_param_columns.keys():
         warnings.warn(
             '"_PARAM_SYMBOL_TIME" explicitly passed among join_with_query symbol parameters! '
-            'This is deprecated - please use symbol_time parameter instead. '
-            'If you specify symbol_time parameter, it will override the explicitly passed value',
+            'This is deprecated - please use symbol_time parameter instead.',
+            FutureWarning,
+            stacklevel=2,
+        )
+    if '_SYMBOL_TIME' in params.keys():
+        warnings.warn(
+            'Query parameter "_SYMBOL_TIME" passed to join_with_query! '
+            'This is deprecated. Please use a dedicated `symbol_time` parameter.',
             FutureWarning,
             stacklevel=2,
         )
-    if symbol_time is not None:
-        if ott.get_object_type(symbol_time) is not otp.nsectime and ott.get_object_type(symbol_time) is not str:
-            raise ValueError(
-                f'Parameter of type {ott.get_object_type(symbol_time)} passed as symbol_time! '
-                'This parameter only supports datetime values or strings'
-            )
-        converted_symbol_param_columns['_PARAM_SYMBOL_TIME'] = symbol_time
 
     # prepare temporary file
     # ------------------------------------ #
@@ -875,6 +877,19 @@ def join_with_query(
     if not sub_source._is_unbound_required():
         sub_source += otp.Empty()
 
+    # adding symbol time
+    if symbol_time is not None:
+        if ott.get_object_type(symbol_time) is not otp.nsectime and ott.get_object_type(symbol_time) is not str:
+            raise ValueError(
+                f'Parameter of type {ott.get_object_type(symbol_time)} passed as symbol_time! '
+                'This parameter only supports datetime values or strings'
+            )
+        if is_join_with_query_symbol_time_otq_supported():
+            params = params.copy()
+            params['_SYMBOL_TIME'] = symbol_time
+        else:
+            converted_symbol_param_columns['_PARAM_SYMBOL_TIME'] = symbol_time
+
     params_str = _columns_to_params_for_joins(params, query_params=True)
     symbol_params_str = _columns_to_params_for_joins(converted_symbol_param_columns)
 

{onetick_py-1.167.0 → onetick_py-1.168.0}/src/onetick_py.egg-info/PKG-INFO

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