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

onetick/py/_version.py

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

onetick/py/core/source.py

@@ -24,7 +24,7 @@ from onetick.py.core._source.tmp_otq import TmpOtq
 from onetick.py.core.column import _Column
 from onetick.py.core.column_operations.base import _Operation, OnetickParameter
 from onetick.py.core.query_inspector import get_query_parameter_list
-from onetick.py.utils import adaptive, adaptive_to_default, default
+from onetick.py.utils import adaptive, adaptive_to_default, default, render_otq
 
 
 def _is_dict_required(symbols):
@@ -939,6 +939,76 @@ class Source:
         kwargs.setdefault('verbose', True)
         self.to_graph().render(**kwargs)
 
+    def render_otq(
+        self,
+        image_path: Optional[str] = None,
+        output_format: Optional[str] = None,
+        load_external_otqs: bool = True,
+        view: bool = False,
+        line_limit: Optional[Tuple[int, int]] = (10, 30),
+        parse_eval_from_params: bool = False,
+        debug: bool = False,
+        **kwargs,
+    ):
+        """
+        Render current :py:class:`~onetick.py.Source` graph.
+
+        Parameters
+        ----------
+        image_path: str, None
+            Path for generated image. If omitted, image will be saved in a temp dir
+        output_format: str, None
+            `Graphviz` rendering format. Default: `png`.
+            If `image_path` contains one of next extensions, `output_format` will be set automatically:
+            `png`, `svg`, `dot`.
+        load_external_otqs: bool
+            If set to `True` (default) dependencies from external .otq files (not listed in ``path`` param)
+            will be loaded automatically.
+        view: bool
+            Defines should generated image be shown after render.
+        line_limit: Tuple[int, int], None
+            Limit for maximum number of lines and length of some EP parameters strings.
+            First param is limit of lines, second - limit of characters in each line.
+            If set to None limit disabled.
+            If one of tuple values set to zero the corresponding limit disabled.
+        parse_eval_from_params: bool
+            Enable parsing and printing `eval` sub-queries from EP parameters.
+        debug: bool
+            Allow to print stdout or stderr from `Graphviz` render.
+        kwargs:
+            Additional arguments to be passed to :py:meth:`onetick.py.Source.to_otq` method (except
+            ``file_name``, ``file_suffix`` and ``query_name`` parameters)
+
+        Returns
+        -------
+        Path to rendered image
+
+        See also
+        --------
+        :py:func:`render_otq <onetick.py.utils.render_otq>`
+
+        Examples
+        --------
+
+        >>> data = otp.DataSource(db='US_COMP', tick_type='TRD', symbols='AAA')  # doctest: +SKIP
+        >>> data1, data2 = data[(data['PRICE'] > 50)]  # doctest: +SKIP
+        >>> data = otp.merge([data1, data2])  # doctest: +SKIP
+        >>> data.render_otq('./path/to/image.png')  # doctest: +SKIP
+
+        .. image:: ../../static/testing/images/render_otq_3.png
+        """
+
+        if {'file_name', 'file_suffix', 'query_name'} & kwargs.keys():
+            raise ValueError(
+                'It\'s not allowed to pass parameters `file_name`, `file_suffix` and `query_name` as `kwargs` '
+                'in `render_otq` method.'
+            )
+
+        otq_path = self.to_otq(**kwargs)
+        return render_otq(
+            otq_path, image_path, output_format, load_external_otqs, view, line_limit, parse_eval_from_params, debug,
+        )
+
     def copy(self, ep=None, columns=None, deep=False) -> 'Source':
         """
         Build an object with copied calculation graph.

onetick/py/utils/render.py

@@ -20,6 +20,7 @@ EPS_WITH_QUERIES = {
     "modify_state_var_from_query": (1, "otq_query"),
     "create_cache": (1, "otq_file_path"),
     "read_cache": (4, "create_cache_query"),
+    "generic_aggregation": (0, "query_name"),
 }
 
 IF_ELSE_EPS = {
@@ -1018,10 +1019,10 @@ def render_otq(
         `Graphviz` rendering format. Default: `png`.
         If `image_path` contains one of next extensions, `output_format` will be set automatically: `png`, `svg`, `dot`.
     load_external_otqs: bool
-        If set to `True` (default) dependencies from external .otq files (not listed in `path` param)
+        If set to `True` (default) dependencies from external .otq files (not listed in ``path`` param)
         will be loaded automatically.
     view: bool
-        Defines should generated image be showed after render.
+        Defines should generated image be shown after render.
     line_limit: Tuple[int, int], None
         Limit for maximum number of lines and length of some EP parameters strings.
         First param is limit of lines, second - limit of characters in each line.
@@ -1030,7 +1031,11 @@ def render_otq(
     parse_eval_from_params: bool
         Enable parsing and printing `eval` sub-queries from EP parameters.
     debug: bool
-        Allow to print stdout or stderr from `Grapthviz` render.
+        Allow to print stdout or stderr from `Graphviz` render.
+
+    Returns
+    -------
+    Path to rendered image
 
     Examples
     --------
@@ -1039,10 +1044,14 @@ def render_otq(
 
     >>> otp.utils.render_otq("./test.otq")  # doctest: +SKIP
 
+    .. image:: ../../static/testing/images/render_otq_1.png
+
     Render multiple files:
 
     >>> otp.utils.render_otq(["./first.otq", "./second.otq"])  # doctest: +SKIP
 
+    .. image:: ../../static/testing/images/render_otq_2.png
+
     Render specific queries from multiple files:
 
     >>> otp.utils.render_otq(["./first.otq", "./second.otq::some_query"])  # doctest: +SKIP

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onetick-py
-Version: 1.164.0
+Version: 1.165.0
 Summary: Python package that allows you to work with OneTick
 Author-email: solutions <solutions@onetick.com>
 License-Expression: MIT
@@ -8,14 +8,14 @@ Project-URL: Documentation, https://docs.pip.distribution.sol.onetick.com
 Project-URL: OneTick, https://onetick.com/
 Classifier: Topic :: Database :: Front-Ends
 Classifier: Topic :: Scientific/Engineering
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas==1.1.5; python_version == "3.6"

{onetick_py-1.164.0.dist-info → onetick_py-1.165.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ onetick/lib/__init__.py,sha256=Rp7CIDoA4E6LIm1f2mNvl_5b_n-0U3suA3FmBXbmKoU,114
 onetick/lib/instance.py,sha256=Fn3yoowjBtImAhR6n-f-Ti5J1q-RdDI-EGLpZvNwTi4,4773
 onetick/py/__init__.py,sha256=j2WBnhu01i8VdOYkn9BGc-7JeAqXQoCFjVfXFZCSz-4,10950
 onetick/py/_stack_info.py,sha256=PHZOkW_fK7Fbl4YEj5CaYK9L6vh4j-bUU7_cSYOWZ30,2546
-onetick/py/_version.py,sha256=zjgr4M5gwRkWf0RQLyS0a1qtBpaS54yljxj-HWo9Z8M,76
+onetick/py/_version.py,sha256=SnHwTlsfIDaXromEXCs1EwviFRUhLjLkAqleAcGSiho,76
 onetick/py/backports.py,sha256=mR00mxe7E7UgBljf-Wa93Mo6lpi-C4Op561uhPUoEt8,815
 onetick/py/cache.py,sha256=f9WwFFCTqCP3eaA4V57tNPjCBHNPzU8ZvH81IuUsBE8,12756
 onetick/py/compatibility.py,sha256=KUBRyt_VayU7UnssXe2q_jOQoqCA4-HwIvUSDl9Xn1M,29696
@@ -54,7 +54,7 @@ onetick/py/core/lambda_object.py,sha256=ayob_2c2XYSG7vFsqp-2b9FSPD-3TFReLbx3de3t
 onetick/py/core/multi_output_source.py,sha256=i9mxtM3yIF30hsVZ-6XttU407VmHklCdPjNDabgB374,7769
 onetick/py/core/per_tick_script.py,sha256=thuNKR4T6v5vxADLaX4ldTAHo_Yvt5HCHGIrNMEK6z8,83237
 onetick/py/core/query_inspector.py,sha256=Jwnw7qUVvjvaT63mQ5PkUSy8x36knoxWrNll3aXuLZw,16440
-onetick/py/core/source.py,sha256=1Yce_XKyhYAJ-jvVJPhJez2wynw7GXiWp7eFy1Kp6O4,61141
+onetick/py/core/source.py,sha256=AX4DUK1frV_FUCG5sywsn42xYX7Y2sYC7vMCOq6TeRg,63998
 onetick/py/core/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onetick/py/core/_internal/_manually_bound_value.py,sha256=a4JF63g9MtXsIwpDqm_PCLBH51_SaG1-T6jWV5-IJ1k,191
 onetick/py/core/_internal/_nodes_history.py,sha256=fCpJ4FWFDzM-bmi-YyCHmNYuFM-CL_lE2bXySOi-TPY,7194
@@ -139,14 +139,14 @@ onetick/py/utils/helpers.py,sha256=XY2PaMUSzFNIpiuiAY_gPQ0TnYTmfoPAGNAFh_6aB14,2
 onetick/py/utils/locator.py,sha256=YUOXU0yh0ZZZOJpJniAq9WNn0_u3X_M5q2tEwt1cp_4,2887
 onetick/py/utils/perf.py,sha256=g0r-9YUc2mx9Lj4PjG6Fk1keO3m9nC3t2cpHx3M-AeQ,19299
 onetick/py/utils/query.py,sha256=b60JmfJDx3mpP74rTQC3qnlCb6t4fYFEauVaH9ulwL8,1330
-onetick/py/utils/render.py,sha256=bWHJc1IYpTXhjTv62zaFLKNFAS9SXNSQNbrqrQoQjbE,37599
+onetick/py/utils/render.py,sha256=UpN8XTRnbRY62INUs5ydN2neSx2Abtw8pHaOLUByDD4,37819
 onetick/py/utils/script.py,sha256=Y8NujEo2_5QaP6KDnLKJiKQ7SmMjw8_dv8sYL9rHDCE,11184
 onetick/py/utils/temp.py,sha256=j-BC155dE46k0zfKTTs26KTF0CK6WA1hO2GD54iunyM,17380
 onetick/py/utils/types.py,sha256=_tYf66r9JVgjtiCJfxIxrg_BQEjHkjlnck_i86dBYEY,3606
 onetick/py/utils/tz.py,sha256=QXclESLGU8YXysUT9DXkcBqLWWO47Bb_tanFUzYpPZI,2800
-onetick_py-1.164.0.dist-info/licenses/LICENSE,sha256=Yhu7lKNFS0fsaN-jSattEMRtCOPueP58Eu5BPH8ZGjM,1075
-onetick_py-1.164.0.dist-info/METADATA,sha256=PA8baIlYbmXmIb8fAj7tRv-7sZEfBtF4jkff0bWC_ZI,7959
-onetick_py-1.164.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-onetick_py-1.164.0.dist-info/entry_points.txt,sha256=QmK_tFswIN-SQRmtnTSBEi8GvT0TVq-66IzXXZIsV3U,81
-onetick_py-1.164.0.dist-info/top_level.txt,sha256=Na1jSJmVMyYGOndaswt554QKIUwQjcYh6th2ATsmw0U,23
-onetick_py-1.164.0.dist-info/RECORD,,
+onetick_py-1.165.0.dist-info/licenses/LICENSE,sha256=Yhu7lKNFS0fsaN-jSattEMRtCOPueP58Eu5BPH8ZGjM,1075
+onetick_py-1.165.0.dist-info/METADATA,sha256=_-jvj9sP16Sa4ntC0CSqpmEG6jI3WRPFZDtboiEHadU,7960
+onetick_py-1.165.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+onetick_py-1.165.0.dist-info/entry_points.txt,sha256=QmK_tFswIN-SQRmtnTSBEi8GvT0TVq-66IzXXZIsV3U,81
+onetick_py-1.165.0.dist-info/top_level.txt,sha256=Na1jSJmVMyYGOndaswt554QKIUwQjcYh6th2ATsmw0U,23
+onetick_py-1.165.0.dist-info/RECORD,,