clickhouse-orm 3.1.0__py2.py3-none-any.whl → 3.2.0__py2.py3-none-any.whl

clickhouse_orm/database.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import datetime
 import logging
 import re
-from contextlib import contextmanager
 from math import ceil
 from string import Template
 
@@ -106,7 +105,6 @@ 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
@@ -124,13 +122,12 @@ class Database:
         """
         self.db_name = db_name
         self.db_url = db_url or self._default_url
-        self.readonly = self.connection_readonly = False
+        self.readonly = False
         self.timeout = timeout
-        self.verify_ssl_cert = verify_ssl_cert
-        self.request_session = None
-        self.__username = username
-        self.__password = password
-
+        self.request_session = requests.Session()
+        self.request_session.verify = verify_ssl_cert
+        if username:
+            self.request_session.auth = (username, password or "")
         self.log_statements = log_statements
         self.settings = {}
         self.db_exists = False  # this is required before running _is_existing_database
@@ -150,22 +147,6 @@ 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.
@@ -417,20 +398,7 @@ class Database:
             if self.log_statements:
                 logger.info(data)
         params = self._build_params(settings)
-
-        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,
-            )
-
+        r = self.request_session.post(self.db_url, params=params, data=data, stream=stream, timeout=self.timeout)
         if r.status_code != 200:
             raise ServerError(r.text)
         return r

{clickhouse_orm-3.1.0.dist-info → clickhouse_orm-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clickhouse_orm
-Version: 3.1.0
+Version: 3.2.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,15 +60,14 @@ 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
-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)
-        ])
+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.1.0.dist-info → clickhouse_orm-3.2.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 clickhouse_orm/__init__.py,sha256=ksYW9scTnD6VVCj8Rzv7B41VkvHDn-JWpyIh1Tjserc,478
-clickhouse_orm/database.py,sha256=JdQhviLvK9sABb7WRrAqMaxgA1nJzuDznfH6VuGRZtg,18804
+clickhouse_orm/database.py,sha256=v4I2NKxkwF6Bm2hJAM6vCg-n9ss10THA9AIoxuHnU1g,17828
 clickhouse_orm/engines.py,sha256=AV80AmLRM3hlEXj3o6GPjjKDPk8YyRdTEns9SZCppA0,11166
 clickhouse_orm/fields.py,sha256=Wfm3NkctRhnaw2bc9KqlncV04FCvBEb_74ky9ZF2aq4,24039
 clickhouse_orm/funcs.py,sha256=8S1kdwCjIJ45imvA2XkxHjDhGOYlNg4aS1vMU2CQ224,42108
@@ -8,7 +8,7 @@ clickhouse_orm/models.py,sha256=pUkLBClnfyXPg5xuHTpobNhFqHtKuHlXTNwWv5PnV_U,2308
 clickhouse_orm/query.py,sha256=3-v1Z5G1xO1c8ywVhmZiz0tpAvBmH19xzeyxVpxc6uU,24103
 clickhouse_orm/system_models.py,sha256=pU-Pvq69GH6QD4iKIrSRxw3Q6n-qlgQzGLqpYwAF12U,6447
 clickhouse_orm/utils.py,sha256=2fEmTrBSDNpPzbbnUOZeCQ2NX5httkOKrJKzgdTezH4,5179
-clickhouse_orm-3.1.0.dist-info/licenses/LICENSE,sha256=MP0KDNu_tFQJrr35YkSFnwwp2F8p2a7Q1Mi2lOs8FLw,1503
-clickhouse_orm-3.1.0.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-clickhouse_orm-3.1.0.dist-info/METADATA,sha256=2Pa9QHoZsuXV_9tEoXVtZgwxk6Xcr_XZmHggSjhzURE,3492
-clickhouse_orm-3.1.0.dist-info/RECORD,,
+clickhouse_orm-3.2.0.dist-info/licenses/LICENSE,sha256=MP0KDNu_tFQJrr35YkSFnwwp2F8p2a7Q1Mi2lOs8FLw,1503
+clickhouse_orm-3.2.0.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+clickhouse_orm-3.2.0.dist-info/METADATA,sha256=jtHZZdZ3ORpb8OrNZQi41B4cVd3E36hNO8MhUnHW40o,3400
+clickhouse_orm-3.2.0.dist-info/RECORD,,