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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openobserve
-Version: 0.4.2
+Version: 0.5.0
 Summary: OpenObserve client for Python
 License-File: LICENSES/CC-BY-4.0.txt
 License-File: LICENSES/CC-BY-SA-4.0.txt
@@ -16,8 +16,10 @@ Provides-Extra: fireducks
 Provides-Extra: pandas
 Provides-Extra: polars
 Provides-Extra: tests
+Requires-Dist: cryptography (>=46.0.5)
 Requires-Dist: fireducks (==1.4.4) ; extra == "fireducks"
-Requires-Dist: guarddog (==2.6.0) ; extra == "ci"
+Requires-Dist: guarddog (==2.7.1) ; extra == "ci"
+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"
@@ -30,6 +32,7 @@ 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"
@@ -37,10 +40,9 @@ 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-multipart (>=0.0.22)
 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

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

@@ -3,7 +3,7 @@
 
 [project]
 name = "python-openobserve"
-version = "0.4.2"
+version = "0.5.0"
 description = "OpenObserve client for Python"
 readme = "README.md"
 requires-python = ">=3.10,<3.14"
@@ -19,8 +19,11 @@ classifiers = [
 ]
 
 dependencies = [
-    "requests~=2.32.4",
+    "cryptography>=46.0.5",
+    "httpx~=0.28",
+    "protobuf>=6.33.5",
     "pydantic~=2.10",
+    "python-multipart>=0.0.22",
     "sqlglot~=26.4.0",
 ]
 
@@ -44,8 +47,7 @@ ci = [
     "pytest-cov==6.0.0",
     "python-dotenv==1.0.1",
     "types-jmespath==1.0.2.20240106",
-    "types-requests==2.32.0.20241016",
-    "guarddog==2.6.0",
+    "guarddog==2.7.1",
 ]
 docs = [
     "mkdocs==1.6.1",
@@ -80,8 +82,7 @@ pytest = "8.3.5"
 pytest-cov = "6.0.0"
 python-dotenv = "1.0.1"
 types-jmespath = "1.0.2.20240106"
-types-requests = "2.32.0.20241016"
-guarddog = "2.6.0"
+guarddog = "2.7.1"
 
 [tool.poetry.group.pandas.dependencies]
 pandas = ">2.2"

{python_openobserve-0.4.2 → python_openobserve-0.5.0}/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:
@@ -159,10 +159,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 +214,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],
@@ -237,6 +237,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 +246,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 +278,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,
@@ -310,7 +321,7 @@ class OpenObserve:
         self._debug(url, verbosity)
 
         if method == "GET":
-            res = requests.get(
+            res = httpx.get(
                 url,
                 headers=self.headers,
                 params=params,
@@ -318,7 +329,7 @@ class OpenObserve:
                 timeout=self.timeout,
             )
         elif method == "POST":
-            res = requests.post(
+            res = httpx.post(
                 url,
                 headers=self.headers,
                 json=json_data,
@@ -326,7 +337,7 @@ class OpenObserve:
                 timeout=self.timeout,
             )
         elif method == "PUT":
-            res = requests.put(
+            res = httpx.put(
                 url,
                 headers=self.headers,
                 json=json_data,
@@ -344,6 +355,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 +368,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 +378,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,
@@ -698,7 +712,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 +744,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,
@@ -800,7 +814,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,