onetick-py 1.164.0__tar.gz → 1.165.0__tar.gz

{onetick_py-1.164.0 → onetick_py-1.165.0}/PKG-INFO

@@ -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 → onetick_py-1.165.0}/pyproject.toml

@@ -19,15 +19,15 @@ dynamic = [
 ]
 license = "MIT"
 license-files = ["LICENSE"]
-requires-python = ">= 3.8"
+requires-python = ">= 3.9"
 classifiers = [
     "Topic :: Database :: Front-Ends",
     "Topic :: Scientific/Engineering",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Environment :: Console",
 ]

{onetick_py-1.164.0 → onetick_py-1.165.0}/src/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-1.164.0 → onetick_py-1.165.0}/src/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-1.164.0 → onetick_py-1.165.0}/src/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 → onetick_py-1.165.0}/src/onetick_py.egg-info/PKG-INFO

@@ -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"