python-openobserve 0.4.2__tar.gz → 0.5.1__tar.gz

{python_openobserve-0.4.2 → python_openobserve-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openobserve
-Version: 0.4.2
+Version: 0.5.1
 Summary: OpenObserve client for Python
 License-File: LICENSES/CC-BY-4.0.txt
 License-File: LICENSES/CC-BY-SA-4.0.txt
@@ -8,19 +8,20 @@ License-File: LICENSES/GPL-3.0-or-later.txt
 Keywords: openobserve,elasticsearch,logging,unstructured data
 Author: Justin Guese
 Author-email: guese.justin@gmail.com
-Requires-Python: >=3.10,<3.14
+Requires-Python: >=3.10,<3.15
 Classifier: Programming Language :: Python :: 3
 Provides-Extra: ci
 Provides-Extra: docs
-Provides-Extra: fireducks
 Provides-Extra: pandas
 Provides-Extra: polars
 Provides-Extra: tests
-Requires-Dist: fireducks (==1.4.4) ; extra == "fireducks"
-Requires-Dist: guarddog (==2.6.0) ; extra == "ci"
+Requires-Dist: cryptography (>=48.0.1,<48.1.0)
+Requires-Dist: h11 (>=0.16.0,<0.17.0)
+Requires-Dist: httpcore (>=1.0.9,<1.1.0)
+Requires-Dist: httpx (>=0.28,<1.0)
 Requires-Dist: jmespath (==1.0.1) ; extra == "ci"
 Requires-Dist: jmespath (==1.0.1) ; extra == "tests"
-Requires-Dist: memray (==1.17.2) ; extra == "ci"
+Requires-Dist: memray (==1.19.3) ; extra == "ci"
 Requires-Dist: mkdocs (==1.6.1) ; extra == "docs"
 Requires-Dist: mkdocs-material (==9.6.15) ; extra == "docs"
 Requires-Dist: mkdocstrings (==0.29.1) ; extra == "docs"
@@ -30,17 +31,19 @@ Requires-Dist: pandas (==2.2.3) ; extra == "ci"
 Requires-Dist: pandas (>=2.2) ; extra == "pandas"
 Requires-Dist: pandas-stubs (==2.2.2.240807) ; extra == "ci"
 Requires-Dist: polars (==1.30.0) ; extra == "polars"
+Requires-Dist: protobuf (>=6.33.5)
 Requires-Dist: pydantic (>=2.10,<3.0)
-Requires-Dist: pytest (==8.3.5) ; extra == "ci"
-Requires-Dist: pytest (==8.3.5) ; extra == "tests"
+Requires-Dist: pyjwt (>=2.12.1,<3.0.0)
+Requires-Dist: pytest (==9.0.3) ; extra == "ci"
+Requires-Dist: pytest (==9.0.3) ; extra == "tests"
 Requires-Dist: pytest-cov (==6.0.0) ; extra == "ci"
 Requires-Dist: pytest-memray (==1.7.0) ; extra == "ci"
-Requires-Dist: python-dotenv (==1.0.1) ; extra == "ci"
-Requires-Dist: python-dotenv (==1.0.1) ; extra == "tests"
-Requires-Dist: requests (>=2.32.4,<2.33.0)
+Requires-Dist: python-dotenv (==1.2.2) ; extra == "ci"
+Requires-Dist: python-dotenv (==1.2.2) ; extra == "tests"
+Requires-Dist: python-multipart (>=0.0.22)
+Requires-Dist: requests (>=2.33.0,<3.0.0)
 Requires-Dist: sqlglot (>=26.4.0,<26.5.0)
 Requires-Dist: types-jmespath (==1.0.2.20240106) ; extra == "ci"
-Requires-Dist: types-requests (==2.32.0.20241016) ; extra == "ci"
 Project-URL: Homepage, https://github.com/JustinGuese/python-openobserve
 Project-URL: Repository, https://github.com/JustinGuese/python-openobserve
 Description-Content-Type: text/markdown
@@ -54,6 +57,7 @@ Description-Content-Type: text/markdown
 
 [![Actions Status - Main](https://github.com/JustinGuese/python-openobserve/workflows/pytest/badge.svg)](https://github.com/JustinGuese/python-openobserve/actions?query=branch%3Amain)
 [![PyPI Downloads](https://static.pepy.tech/badge/python-openobserve/week)](https://pepy.tech/projects/python-openobserve)
+<!-- markdown-link-check-disable-next-line -->
 [![Documentation build status](https://img.shields.io/readthedocs/python-openobserve?logo=read-the-docs)](https://python-openobserve.readthedocs.org/en/latest/)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/JustinGuese/python-openobserve/badge)](https://scorecard.dev/viewer/?uri=github.com/JustinGuese/python-openobserve)
 

{python_openobserve-0.4.2 → python_openobserve-0.5.1}/README.md

@@ -7,6 +7,7 @@
 
 [![Actions Status - Main](https://github.com/JustinGuese/python-openobserve/workflows/pytest/badge.svg)](https://github.com/JustinGuese/python-openobserve/actions?query=branch%3Amain)
 [![PyPI Downloads](https://static.pepy.tech/badge/python-openobserve/week)](https://pepy.tech/projects/python-openobserve)
+<!-- markdown-link-check-disable-next-line -->
 [![Documentation build status](https://img.shields.io/readthedocs/python-openobserve?logo=read-the-docs)](https://python-openobserve.readthedocs.org/en/latest/)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/JustinGuese/python-openobserve/badge)](https://scorecard.dev/viewer/?uri=github.com/JustinGuese/python-openobserve)
 

{python_openobserve-0.4.2 → python_openobserve-0.5.1}/pyproject.toml

@@ -3,10 +3,10 @@
 
 [project]
 name = "python-openobserve"
-version = "0.4.2"
+version = "0.5.1"
 description = "OpenObserve client for Python"
 readme = "README.md"
-requires-python = ">=3.10,<3.14"
+requires-python = ">=3.10,<3.15"
 license-files = [
     "LICENSES/CC-BY-4.0.txt",
     "LICENSES/CC-BY-SA-4.0.txt",
@@ -19,9 +19,16 @@ classifiers = [
 ]
 
 dependencies = [
-    "requests~=2.32.4",
+    "cryptography (>=48.0.1,<48.1.0)",
+    "h11~=0.16.0",
+    "httpcore~=1.0.9",
+    "httpx~=0.28",
+    "protobuf>=6.33.5",
     "pydantic~=2.10",
+    "python-multipart>=0.0.22",
     "sqlglot~=26.4.0",
+    "pyjwt (>=2.12.1,<3.0.0)",
+    "requests (>=2.33.0,<3.0.0)",
 ]
 
 [project.urls]
@@ -34,33 +41,30 @@ python_openobserve = "python_openobserve:openobserve"
 [project.optional-dependencies]
 ci = [
     "jmespath==1.0.1",
-    "memray==1.17.2",
+    "memray==1.19.3",
     "pytest-memray==1.7.0",
     "mypy==1.15.0",
     "mypy-extensions==1.0.0",
     "pandas==2.2.3",
     "pandas-stubs==2.2.2.240807",
-    "pytest==8.3.5",
+    "pytest==9.0.3",
     "pytest-cov==6.0.0",
-    "python-dotenv==1.0.1",
+    "python-dotenv==1.2.2",
     "types-jmespath==1.0.2.20240106",
-    "types-requests==2.32.0.20241016",
-    "guarddog==2.6.0",
 ]
 docs = [
     "mkdocs==1.6.1",
     "mkdocs-material==9.6.15",
     "mkdocstrings==0.29.1",
 ]
-tests = ["pytest==8.3.5", "jmespath==1.0.1", "python-dotenv==1.0.1"]
+tests = ["pytest==9.0.3", "jmespath==1.0.1", "python-dotenv==1.2.2"]
 pandas = ["pandas>=2.2"]
 polars = ["polars==1.30.0"]
-fireducks = ["fireducks==1.4.4"]
 
 [tool.poetry.group.test.dependencies]
-pytest = "8.3.5"
+pytest = "9.0.3"
 jmespath = "1.0.1"
-python-dotenv = "1.0.1"
+python-dotenv = "1.2.2"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "1.6.1"
@@ -69,27 +73,23 @@ mkdocstrings = "0.29.1"
 
 [tool.poetry.group.ci.dependencies]
 jmespath = "1.0.1"
-memray = "1.17.2"
+memray = "1.19.3"
 pytest-memray = "1.7.0"
 mypy = "1.15.0"
 mypy-extensions = "1.0.0"
 pandas = "2.2.3"
 openpyxl = "3.1.5"
 pandas-stubs = "2.2.2.240807"
-pytest = "8.3.5"
+pytest = "9.0.3"
 pytest-cov = "6.0.0"
-python-dotenv = "1.0.1"
+python-dotenv = "1.2.2"
 types-jmespath = "1.0.2.20240106"
-types-requests = "2.32.0.20241016"
-guarddog = "2.6.0"
 
 [tool.poetry.group.pandas.dependencies]
 pandas = ">2.2"
 
 [tool.poetry.group.polars.dependencies]
 polars = "1.30.0"
-[tool.poetry.group.fireducks.dependencies]
-fireducks = "1.4.4"
 
 [build-system]
 requires = ["poetry-core"]

{python_openobserve-0.4.2 → python_openobserve-0.5.1}/python_openobserve/openobserve.py

@@ -19,7 +19,7 @@ from datetime import datetime
 from typing import List, Dict, Union, Optional, Any, cast
 from pathlib import Path
 
-import requests
+import httpx
 import sqlglot  # type: ignore
 
 try:
@@ -40,14 +40,6 @@ except ImportError:
     print("Can't import polars. some functions may be unavailable.")
     HAVE_MODULE_POLARS = False
 
-try:
-    import fireducks  # type: ignore
-
-    HAVE_MODULE_FIREDUCKS = True
-except ImportError:
-    print("Can't import fireducks. Some functions may be unavailable.")
-    HAVE_MODULE_FIREDUCKS = False
-
 key_mapping = {
     "dashboards": "dashboards",
     "users": "data",
@@ -159,10 +151,10 @@ class OpenObserve:
             pprint(msg)
 
     def _handle_response(
-        self, res: requests.Response, action: str = "request"
+        self, res: httpx.Response, action: str = "request"
     ) -> List[Dict]:
         """Handle API response and return JSON if successful"""
-        if res.status_code != requests.codes.ok:
+        if res.status_code != httpx.codes.OK:
             raise Exception(
                 f"Openobserve {action} returned {res.status_code}. Text: {res.text}"
             )
@@ -214,7 +206,7 @@ class OpenObserve:
         assert isinstance(document, dict), "document must be a dict"
         document = self.__datetime2Str(flatten(document))
 
-        res = requests.post(
+        res = httpx.post(
             f"{self.openobserve_url.replace('[STREAM]', index)}/_json",
             headers=self.headers,
             json=[document],
@@ -223,10 +215,10 @@ class OpenObserve:
         )
         response_json = self._handle_response(res, "index")
 
-        if response_json["status"][0]["failed"] > 0:  # type:ignore[call-overload]
+        if response_json["status"][0]["failed"] > 0:  # type: ignore[call-overload]
             raise Exception(
                 "Openobserve index failed. "
-                f"{response_json['status'][0]['error']}"  # type:ignore[call-overload]
+                f"{response_json['status'][0]['error']}"  # type: ignore[call-overload]
                 f". document: {document}"
             )
         return response_json
@@ -237,6 +229,7 @@ class OpenObserve:
         *,
         start_time: Union[datetime, int] = 0,
         end_time: Union[datetime, int] = 0,
+        query_size: int = 1000,
         verbosity: int = 0,
         timeout: int = 300,
         timestamp_conversion_auto: bool = False,
@@ -245,11 +238,14 @@ class OpenObserve:
         """
         OpenObserve search function
         https://openobserve.ai/docs/api/search/search/
+        https://github.com/openobserve/openobserve/commit/3ccf0be93391885136377b41a4cc2a36d80f904a
 
         Args:
           sql: input sql query
           start_time: start of search interval, either datetime, either int/epoch
           end_time: end of search interval, either datetime, either int/epoch
+          query_size: maximum number of results returned (default: 1000)
+                      See also ZO_QUERY_DEFAULT_LIMIT
           verbosity: how verbose to run from 0/less to 5/more
           timeout: http timeout
           timestamp_conversion_auto: try to convert automatically column containing time as name
@@ -274,10 +270,17 @@ class OpenObserve:
         except sqlglot.errors.ParseError as e:
             raise e
 
-        query = {"query": {"sql": sql, "start_time": start_time, "end_time": end_time}}
+        query = {
+            "query": {
+                "sql": sql,
+                "start_time": start_time,
+                "end_time": end_time,
+                "size": query_size,
+            }
+        }
         self._debug(query, verbosity)
 
-        res = requests.post(
+        res = httpx.post(
             f"{self.openobserve_url.replace('/[STREAM]', '')}/_search",
             json=query,
             headers=self.headers,
@@ -286,7 +289,7 @@ class OpenObserve:
         )
 
         response_json = self._handle_response(res, "search")
-        res_hits = response_json["hits"]  # type:ignore[call-overload]
+        res_hits = response_json["hits"]  # type: ignore[call-overload]
         self._debug(res_hits, verbosity, 3)
 
         if timestamp_conversion_auto or timestamp_columns is not None:
@@ -310,7 +313,7 @@ class OpenObserve:
         self._debug(url, verbosity)
 
         if method == "GET":
-            res = requests.get(
+            res = httpx.get(
                 url,
                 headers=self.headers,
                 params=params,
@@ -318,7 +321,7 @@ class OpenObserve:
                 timeout=self.timeout,
             )
         elif method == "POST":
-            res = requests.post(
+            res = httpx.post(
                 url,
                 headers=self.headers,
                 json=json_data,
@@ -326,7 +329,7 @@ class OpenObserve:
                 timeout=self.timeout,
             )
         elif method == "PUT":
-            res = requests.put(
+            res = httpx.put(
                 url,
                 headers=self.headers,
                 json=json_data,
@@ -344,6 +347,7 @@ class OpenObserve:
         *,
         start_time: Union[datetime, int] = 0,
         end_time: Union[datetime, int] = 0,
+        query_size: int = 1000,
         verbosity: int = 0,
         timeout: int = 300,
         timestamp_conversion_auto: bool = False,
@@ -356,6 +360,7 @@ class OpenObserve:
           sql: input sql query
           start_time: start of search interval, either datetime, either int/epoch
           end_time: end of search interval, either datetime, either int/epoch
+          query_size: maximum number of results returned (default: 1000)
           verbosity: how verbose to run from 0/less to 5/more
           timeout: http timeout
           timestamp_conversion_auto: try to convert automatically column containing time as name
@@ -365,6 +370,7 @@ class OpenObserve:
             sql,
             start_time=start_time,
             end_time=end_time,
+            query_size=query_size,
             verbosity=verbosity,
             timeout=timeout,
             timestamp_conversion_auto=timestamp_conversion_auto,
@@ -440,57 +446,6 @@ class OpenObserve:
                     ) from err
         return df_res
 
-    def search2df_fireducks(
-        self,
-        sql: str,
-        *,
-        start_time: Union[datetime, int] = 0,
-        end_time: Union[datetime, int] = 0,
-        verbosity: int = 0,
-        timeout: int = 300,
-        timestamp_conversion_auto: bool = False,
-        timestamp_columns: Union[List[str], None] = None,
-    ) -> fireducks.core.pandas.DataFrame:
-        """
-        OpenObserve search function with fireducks df output
-
-        Args:
-          sql: input sql query
-          start_time: start of search interval, either datetime, either int/epoch
-          end_time: end of search interval, either datetime, either int/epoch
-          verbosity: how verbose to run from 0/less to 5/more
-          timeout: http timeout
-          timestamp_conversion_auto: try to convert automatically column containing time as name
-          timestamp_columns: convert given columns to timestamp
-        """
-        res_json_hits = self.search(
-            sql,
-            start_time=start_time,
-            end_time=end_time,
-            verbosity=verbosity,
-            timeout=timeout,
-            timestamp_conversion_auto=timestamp_conversion_auto,
-            # leaving conversion to pandas
-            # timestamp_columns=timestamp_columns,
-        )
-        df_res = fireducks.core.pandas.json_normalize(res_json_hits)
-
-        if timestamp_columns is not None:
-            for col in list(
-                set(df_res.columns) & set(["_timestamp"] + timestamp_columns)
-            ):
-                try:
-                    # ensure timestamp format
-                    if col in ["_timestamp"] + timestamp_columns:
-                        df_res[col] = fireducks.pandas.to_datetime(df_res[col])
-                except Exception as err:
-                    raise Exception(
-                        err,
-                        "query",
-                        f"query column type conversion: {col} -> {df_res[col]}",
-                    ) from err
-        return df_res
-
     # pylint: disable=too-many-branches,too-many-locals
     def export_objects_split(
         self,
@@ -655,14 +610,14 @@ class OpenObserve:
                     name: [
                         api_path,
                         self.list_objects(api_path, verbosity=verbosity),
-                    ]  # type:ignore[misc]
+                    ]  # type: ignore[misc]
                     for name, api_path in object_types.items()
                 }
 
                 for name, object_data in data.items():
                     self.export_objects_split(
-                        object_data[0],  # type:ignore[arg-type]
-                        object_data[1],  # type:ignore[arg-type]
+                        object_data[0],  # type: ignore[arg-type]
+                        object_data[1],  # type: ignore[arg-type]
                         file_path,
                         verbosity=verbosity,
                         strip=strip,
@@ -674,7 +629,7 @@ class OpenObserve:
                 data = {
                     name: self.list_objects(
                         api_path, verbosity=verbosity
-                    )  # type:ignore[misc]
+                    )  # type: ignore[misc]
                     for name, api_path in object_types.items()
                 }
 
@@ -698,7 +653,7 @@ class OpenObserve:
         self._debug(f"Create object {object_type} url: {url}", verbosity, level=1)
         self._debug(f"Create object json input: {object_json}", verbosity, level=2)
 
-        res = requests.post(
+        res = httpx.post(
             url,
             json=object_json,
             headers=self.headers,
@@ -730,7 +685,7 @@ class OpenObserve:
         self._debug(f"Update object {object_type} url: {url}", verbosity, level=1)
         self._debug(f"Update object json input: {object_json}", verbosity, level=2)
 
-        res = requests.put(
+        res = httpx.put(
             url,
             json=object_json,
             headers=self.headers,
@@ -766,7 +721,7 @@ class OpenObserve:
         count_update = 0
         current = self.list_objects(object_type, verbosity)
         self._debug(f"Create/Update by name objects list: {current}", verbosity, 4)
-        for obj in current[key]:  # type:ignore[call-overload]
+        for obj in current[key]:  # type: ignore[call-overload]
             if key_name in obj and object_name.strip() == obj[key_name].strip():
                 if overwrite:
                     object_json[key_id] = obj[key_id]
@@ -800,7 +755,7 @@ class OpenObserve:
             url = url.replace("/api", "/api/v2")
         self._debug(f"Delete object {object_type} url: {url}", verbosity, level=1)
 
-        res = requests.delete(
+        res = httpx.delete(
             url,
             headers=self.headers,
             verify=self.verify,
@@ -829,7 +784,7 @@ class OpenObserve:
         count_delete = 0
         current = self.list_objects(object_type, verbosity)
         self._debug(f"Delete by name objects list: {current}", verbosity, 3)
-        for obj in current[key]:  # type:ignore[call-overload]
+        for obj in current[key]:  # type: ignore[call-overload]
             if "name" in obj and object_name == obj[key_name]:
                 self._debug(f"Delete by name matching object: {obj}", verbosity)
                 self.delete_object(object_type, obj[key_id], verbosity)