clickhouse-orm 3.0.1__tar.gz → 3.1.0__tar.gz

{clickhouse_orm-3.0.1 → clickhouse_orm-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clickhouse_orm
-Version: 3.0.1
+Version: 3.1.0
 Summary: A simple ORM for working with the Clickhouse database. Maintainance fork of infi.clickhouse_orm.
 Author-email: Oliver Margetts <oliver.margetts@gmail.com>
 Description-Content-Type: text/markdown
@@ -60,14 +60,15 @@ Now we can collect usage statistics per CPU, and write them to the database:
 import psutil, time, datetime
 
 psutil.cpu_percent(percpu=True) # first sample should be discarded
-while True:
-    time.sleep(1)
-    stats = psutil.cpu_percent(percpu=True)
-    timestamp = datetime.datetime.now()
-    db.insert([
-        CPUStats(timestamp=timestamp, cpu_id=cpu_id, cpu_percent=cpu_percent)
-        for cpu_id, cpu_percent in enumerate(stats)
-    ])
+with db.session():  # use a requests session for efficiency
+    while True:
+        time.sleep(1)
+        stats = psutil.cpu_percent(percpu=True)
+        timestamp = datetime.datetime.now()
+        db.insert([
+            CPUStats(timestamp=timestamp, cpu_id=cpu_id, cpu_percent=cpu_percent)
+            for cpu_id, cpu_percent in enumerate(stats)
+        ])
 ```
 
 Querying the table is easy, using either the query builder or raw SQL:

{clickhouse_orm-3.0.1 → clickhouse_orm-3.1.0}/README.md

@@ -33,14 +33,15 @@ Now we can collect usage statistics per CPU, and write them to the database:
 import psutil, time, datetime
 
 psutil.cpu_percent(percpu=True) # first sample should be discarded
-while True:
-    time.sleep(1)
-    stats = psutil.cpu_percent(percpu=True)
-    timestamp = datetime.datetime.now()
-    db.insert([
-        CPUStats(timestamp=timestamp, cpu_id=cpu_id, cpu_percent=cpu_percent)
-        for cpu_id, cpu_percent in enumerate(stats)
-    ])
+with db.session():  # use a requests session for efficiency
+    while True:
+        time.sleep(1)
+        stats = psutil.cpu_percent(percpu=True)
+        timestamp = datetime.datetime.now()
+        db.insert([
+            CPUStats(timestamp=timestamp, cpu_id=cpu_id, cpu_percent=cpu_percent)
+            for cpu_id, cpu_percent in enumerate(stats)
+        ])
 ```
 
 Querying the table is easy, using either the query builder or raw SQL:

{clickhouse_orm-3.0.1 → clickhouse_orm-3.1.0}/clickhouse_orm/database.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import datetime
 import logging
 import re
+from contextlib import contextmanager
 from math import ceil
 from string import Template
 
@@ -105,6 +106,7 @@ class Database:
         timeout=60,
         verify_ssl_cert=True,
         log_statements=False,
+        session=None,
     ):
         """
         Initializes a database instance. Unless it's readonly, the database will be
@@ -122,12 +124,13 @@ class Database:
         """
         self.db_name = db_name
         self.db_url = db_url or self._default_url
-        self.readonly = False
+        self.readonly = self.connection_readonly = False
         self.timeout = timeout
-        self.request_session = requests.Session()
-        self.request_session.verify = verify_ssl_cert
-        if username:
-            self.request_session.auth = (username, password or "")
+        self.verify_ssl_cert = verify_ssl_cert
+        self.request_session = None
+        self.__username = username
+        self.__password = password
+
         self.log_statements = log_statements
         self.settings = {}
         self.db_exists = False  # this is required before running _is_existing_database
@@ -147,6 +150,22 @@ class Database:
         # Version 19.0 and above support LowCardinality
         self.has_low_cardinality_support = self.server_version >= (19, 0)
 
+    @contextmanager
+    def session(self):
+        """Contextmanager to use a persistent session for requests.
+
+        This can be quicker if making lots of small queries.
+        """
+        with requests.Session() as session:
+            session.verify = self.verify_ssl_cert
+            if self.__username:
+                session.auth = (self.__username, self.__password or "")
+            self.request_session = session
+            try:
+                yield self
+            finally:
+                self.request_session = None
+
     def create_database(self):
         """
         Creates the database on the ClickHouse server if it does not already exist.
@@ -398,7 +417,20 @@ class Database:
             if self.log_statements:
                 logger.info(data)
         params = self._build_params(settings)
-        r = self.request_session.post(self.db_url, params=params, data=data, stream=stream, timeout=self.timeout)
+
+        if self.request_session:
+            r = self.request_session.post(self.db_url, params=params, data=data, stream=stream, timeout=self.timeout)
+        else:
+            r = requests.post(
+                self.db_url,
+                params=params,
+                data=data,
+                stream=stream,
+                timeout=self.timeout,
+                verify=self.verify_ssl_cert,
+                auth=(self.__username, self.__password or "") if self.__username else None,
+            )
+
         if r.status_code != 200:
             raise ServerError(r.text)
         return r

{clickhouse_orm-3.0.1 → clickhouse_orm-3.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "clickhouse_orm"
-version = "3.0.1"
+version = "3.1.0"
 readme = "README.md"
 description = "A simple ORM for working with the Clickhouse database. Maintainance fork of infi.clickhouse_orm."
 authors = [