crate 2.0.0.dev5__tar.gz → 2.1.0.dev0__tar.gz

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/CHANGES.rst

@@ -5,17 +5,29 @@ Changes for crate
 Unreleased
 ==========
 
+- Changed connection behaviour to fail early if the database cluster
+  does not respond
+
+2025/01/30 2.0.0
+================
+
 - Switched JSON encoder to use the `orjson`_ library, to improve JSON
   marshalling performance. Thanks, @widmogrod.
+
   orjson is fast and in some spots even more correct when compared against
   Python's stdlib ``json`` module. Contrary to the stdlib variant, orjson
-  will serialize to ``bytes`` instead of ``str``. Please also note it
-  will not deserialize to dataclasses, UUIDs, decimals, etc., or support
-  ``object_hook``. Within ``crate-python``, it is applied with an encoder
-  function for additional type support about Python's ``Decimal`` type and
-  freezegun's ``FakeDatetime`` type.
+  will serialize to ``bytes`` instead of ``str``. When sending data to CrateDB,
+  ``crate-python`` uses a custom encoder to add support for additional data
+  types.
+
+  - Python's ``Decimal`` type will be serialized to ``str``.
+  - Python's ``dt.datetime`` and ``dt.date`` types will be serialized to
+    ``int`` (``LONG``) after converting to milliseconds since epoch, to
+    optimally accommodate CrateDB's `TIMESTAMP`_ representation.
+  - NumPy's data types will be handled by ``orjson`` without any ado.
 
 .. _orjson: https://github.com/ijl/orjson
+.. _TIMESTAMP: https://cratedb.com/docs/crate/reference/en/latest/general/ddl/data-types.html#type-timestamp
 
 2024/11/23 1.0.1
 ================

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/DEVELOP.rst

@@ -5,7 +5,7 @@ CrateDB Python developer guide
 Setup
 =====
 
-Optionally install Python package and project manager ``uv``,
+Optionally install Python package and project manager `uv`_,
 in order to significantly speed up the package installation::
 
     {apt,brew,pip,zypper} install uv
@@ -67,16 +67,11 @@ To inspect the whole list of test cases, run::
 
     bin/test --list-tests
 
-You can run the tests against multiple Python interpreters with `tox`_::
-
-    tox
-
-To do this, you will need the respective Python interpreter versions available
-on your ``$PATH``.
-
-To run against a single interpreter, you can also invoke::
-
-    tox -e py37
+The CI setup on GitHub Actions (GHA) provides a full test matrix covering
+relevant Python versions. You can invoke the software tests against a specific
+Python interpreter or multiple `Python versions`_ on your workstation using
+`uv`_, by supplying the ``--python`` command-line option, or by defining the
+`UV_PYTHON`_ environment variable prior to invoking ``source bootstrap.sh``.
 
 *Note*: Before running the tests, make sure to stop all CrateDB instances which
 are listening on the default CrateDB transport port to avoid side effects with
@@ -168,12 +163,14 @@ nothing special you need to do to get the live docs to update.
 .. _@crate/docs: https://github.com/orgs/crate/teams/docs
 .. _buildout: https://pypi.python.org/pypi/zc.buildout
 .. _PyPI: https://pypi.python.org/pypi
+.. _Python versions: https://docs.astral.sh/uv/concepts/python-versions/
 .. _Read the Docs: http://readthedocs.org
 .. _ReStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Sphinx: http://sphinx-doc.org/
 .. _tests/assets/pki/*.pem: https://github.com/crate/crate-python/tree/main/tests/assets/pki
-.. _tox: http://testrun.org/tox/latest/
 .. _twine: https://pypi.python.org/pypi/twine
 .. _useful command-line options for zope-testrunner: https://pypi.org/project/zope.testrunner/#some-useful-command-line-options-to-get-you-started
+.. _uv: https://docs.astral.sh/uv/
+.. _UV_PYTHON: https://docs.astral.sh/uv/configuration/environment/#uv_python
 .. _versions hosted on ReadTheDocs: https://readthedocs.org/projects/crate-python/versions/
 .. _zope.testrunner: https://pypi.org/project/zope.testrunner/

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: crate
-Version: 2.0.0.dev5
+Version: 2.1.0.dev0
 Summary: CrateDB Python Client
 Home-page: https://github.com/crate/crate-python
 Author: Crate.io
@@ -39,15 +39,14 @@ Provides-Extra: test
 Requires-Dist: backports.zoneinfo<1; python_version < "3.9" and extra == "test"
 Requires-Dist: certifi; extra == "test"
 Requires-Dist: createcoverage<2,>=1; extra == "test"
-Requires-Dist: mypy<1.15; extra == "test"
-Requires-Dist: poethepoet<0.33; extra == "test"
-Requires-Dist: ruff<0.10; extra == "test"
+Requires-Dist: mypy<1.16; extra == "test"
+Requires-Dist: poethepoet<1; extra == "test"
+Requires-Dist: ruff<0.12; extra == "test"
 Requires-Dist: stopit<2,>=1.1.2; extra == "test"
-Requires-Dist: tox<5,>=3; extra == "test"
 Requires-Dist: pytz; extra == "test"
 Requires-Dist: zc.customdoctests<2,>=1.0.1; extra == "test"
 Requires-Dist: zope.testing<6,>=4; extra == "test"
-Requires-Dist: zope.testrunner<7,>=5; extra == "test"
+Requires-Dist: zope.testrunner<8,>=5; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -56,6 +55,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/docs/by-example/client.rst

@@ -35,12 +35,8 @@ respond, the request is automatically routed to the next server:
     >>> connection = client.connect([invalid_host, crate_host])
     >>> connection.close()
 
-If no ``servers`` are given, the default one ``http://127.0.0.1:4200`` is used:
-
-    >>> connection = client.connect()
-    >>> connection.client._active_servers
-    ['http://127.0.0.1:4200']
-    >>> connection.close()
+If no ``servers`` are supplied to the ``connect`` method, the default address
+``http://127.0.0.1:4200`` is used.
 
 If the option ``error_trace`` is set to ``True``, the client will print a whole
 traceback if a server error occurs:

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/docs/connect.rst

@@ -10,7 +10,7 @@ Connect to CrateDB
     `Python Database API Specification v2.0`_ (PEP 249).
 
     For help using the `SQLAlchemy`_ dialect, consult the
-    :ref:`SQLAlchemy dialect documentation <using-sqlalchemy>`.
+    :ref:`SQLAlchemy dialect documentation <sqlalchemy-cratedb:index>`.
 
 .. SEEALSO::
 

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/docs/index-all.rst

@@ -16,7 +16,6 @@ CrateDB Python Client -- all pages
     connect
     query
     blobs
-    sqlalchemy
     data-types
     by-example/index
     other-options

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/docs/index.rst

@@ -99,7 +99,7 @@ please consult the :ref:`data-types` documentation page.
 Migration Notes
 ===============
 
-The :ref:`CrateDB dialect <using-sqlalchemy>` for `SQLAlchemy`_ is provided
+The :ref:`CrateDB dialect <sqlalchemy-cratedb:index>` for `SQLAlchemy`_ is provided
 by the `sqlalchemy-cratedb`_ package.
 
 If you are migrating from previous versions of ``crate[sqlalchemy]<1.0.0``, you

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/docs/query.rst

@@ -10,7 +10,7 @@ Query CrateDB
     `Python Database API Specification v2.0`_ (PEP 249).
 
     For help using the `SQLAlchemy`_ dialect, consult
-    :ref:`the SQLAlchemy dialect documentation <using-sqlalchemy>`.
+    :ref:`the SQLAlchemy dialect documentation <sqlalchemy-cratedb:index>`.
 
 .. SEEALSO::
 

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/requirements.txt

@@ -1,2 +1,4 @@
+setuptools<80.3
+urllib3<2.4
 zc.buildout==3.3
 zope.interface==6.4.post2

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/setup.py

@@ -67,15 +67,14 @@ setup(
             'backports.zoneinfo<1; python_version<"3.9"',
             "certifi",
             "createcoverage>=1,<2",
-            "mypy<1.15",
-            "poethepoet<0.33",
-            "ruff<0.10",
+            "mypy<1.16",
+            "poethepoet<1",
+            "ruff<0.12",
             "stopit>=1.1.2,<2",
-            "tox>=3,<5",
             "pytz",
             "zc.customdoctests>=1.0.1,<2",
             "zope.testing>=4,<6",
-            "zope.testrunner>=5,<7",
+            "zope.testrunner>=5,<8",
         ],
     },
     python_requires=">=3.6",

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate/client/__init__.py

@@ -29,7 +29,7 @@ __all__ = [
 
 # version string read from setup.py using a regex. Take care not to break the
 # regex!
-__version__ = "2.0.0.dev5"
+__version__ = "2.1.0.dev0"
 
 # codeql[py/unused-global-variable]
 apilevel = "2.0"

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate/client/connection.py

@@ -18,8 +18,10 @@
 # However, if you have executed another commercial license agreement
 # with Crate these terms will supersede the license and you may use the
 # software solely pursuant to the terms of the relevant commercial agreement.
+import json
 
 from verlib2 import Version
+from verlib2.packaging.version import InvalidVersion
 
 from .blob import BlobContainer
 from .cursor import Cursor
@@ -197,14 +199,21 @@ class Connection:
 
     def _lowest_server_version(self):
         lowest = None
+        server_count = len(self.client.active_servers)
+        connection_errors = []
         for server in self.client.active_servers:
             try:
                 _, _, version = self.client.server_infos(server)
                 version = Version(version)
-            except (ValueError, ConnectionError):
+            except ConnectionError as ex:
+                connection_errors.append(ex)
+                continue
+            except (ValueError, InvalidVersion):
                 continue
             if not lowest or version < lowest:
                 lowest = version
+        if connection_errors and len(connection_errors) == server_count:
+            raise ConnectionError(json.dumps(list(map(str, connection_errors))))
         return lowest or Version("0.0.0")
 
     def __repr__(self):

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate/client/http.py

@@ -20,6 +20,8 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 
+import calendar
+import datetime as dt
 import heapq
 import io
 import logging
@@ -84,19 +86,35 @@ def super_len(o):
     return None
 
 
-def cratedb_json_encoder(obj: t.Any) -> str:
+epoch_aware = dt.datetime(1970, 1, 1, tzinfo=dt.timezone.utc)
+epoch_naive = dt.datetime(1970, 1, 1)
+
+
+def json_encoder(obj: t.Any) -> t.Union[int, str]:
     """
     Encoder function for orjson, with additional type support.
 
-    - Python's `Decimal` type.
-    - freezegun's `FakeDatetime` type.
+    - Python's `Decimal` type will be serialized to `str`.
+    - Python's `dt.datetime` and `dt.date` types will be
+      serialized to `int` after converting to milliseconds
+      since epoch.
 
     https://github.com/ijl/orjson#default
+    https://cratedb.com/docs/crate/reference/en/latest/general/ddl/data-types.html#type-timestamp
     """
     if isinstance(obj, Decimal):
         return str(obj)
-    elif hasattr(obj, "isoformat"):
-        return obj.isoformat()
+    if isinstance(obj, dt.datetime):
+        if obj.tzinfo is not None:
+            delta = obj - epoch_aware
+        else:
+            delta = obj - epoch_naive
+        return int(
+            delta.microseconds / 1000.0
+            + (delta.seconds + delta.days * 24 * 3600) * 1000.0
+        )
+    if isinstance(obj, dt.date):
+        return calendar.timegm(obj.timetuple()) * 1000
     raise TypeError
 
 
@@ -108,8 +126,12 @@ def json_dumps(obj: t.Any) -> bytes:
     """
     return orjson.dumps(
         obj,
-        default=cratedb_json_encoder,
-        option=(orjson.OPT_NON_STR_KEYS | orjson.OPT_SERIALIZE_NUMPY),
+        default=json_encoder,
+        option=(
+            orjson.OPT_PASSTHROUGH_DATETIME
+            | orjson.OPT_NON_STR_KEYS
+            | orjson.OPT_SERIALIZE_NUMPY
+        ),
     )
 
 

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: crate
-Version: 2.0.0.dev5
+Version: 2.1.0.dev0
 Summary: CrateDB Python Client
 Home-page: https://github.com/crate/crate-python
 Author: Crate.io
@@ -39,15 +39,14 @@ Provides-Extra: test
 Requires-Dist: backports.zoneinfo<1; python_version < "3.9" and extra == "test"
 Requires-Dist: certifi; extra == "test"
 Requires-Dist: createcoverage<2,>=1; extra == "test"
-Requires-Dist: mypy<1.15; extra == "test"
-Requires-Dist: poethepoet<0.33; extra == "test"
-Requires-Dist: ruff<0.10; extra == "test"
+Requires-Dist: mypy<1.16; extra == "test"
+Requires-Dist: poethepoet<1; extra == "test"
+Requires-Dist: ruff<0.12; extra == "test"
 Requires-Dist: stopit<2,>=1.1.2; extra == "test"
-Requires-Dist: tox<5,>=3; extra == "test"
 Requires-Dist: pytz; extra == "test"
 Requires-Dist: zc.customdoctests<2,>=1.0.1; extra == "test"
 Requires-Dist: zope.testing<6,>=4; extra == "test"
-Requires-Dist: zope.testrunner<7,>=5; extra == "test"
+Requires-Dist: zope.testrunner<8,>=5; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -56,6 +55,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate.egg-info/SOURCES.txt

@@ -20,7 +20,6 @@ docs/index.rst
 docs/other-options.rst
 docs/query.rst
 docs/requirements.txt
-docs/sqlalchemy.rst
 docs/_extra/robots.txt
 docs/by-example/blob.rst
 docs/by-example/client.rst

{crate-2.0.0.dev5 → crate-2.1.0.dev0}/src/crate.egg-info/requires.txt

@@ -9,15 +9,14 @@ sphinx<9,>=3.5
 [test]
 certifi
 createcoverage<2,>=1
-mypy<1.15
-poethepoet<0.33
-ruff<0.10
+mypy<1.16
+poethepoet<1
+ruff<0.12
 stopit<2,>=1.1.2
-tox<5,>=3
 pytz
 zc.customdoctests<2,>=1.0.1
 zope.testing<6,>=4
-zope.testrunner<7,>=5
+zope.testrunner<8,>=5
 
 [test:python_version < "3.9"]
 backports.zoneinfo<1

crate-2.0.0.dev5/docs/sqlalchemy.rst

@@ -1,17 +0,0 @@
-.. _sqlalchemy-support:
-.. _using-sqlalchemy:
-
-==================
-SQLAlchemy support
-==================
-
-`SQLAlchemy`_ is the most popular `Object-Relational Mapping`_ (ORM) library
-for Python.
-
-The `SQLAlchemy`_ CrateDB dialect is provided by the `sqlalchemy-cratedb`_
-package.
-
-
-.. _Object-Relational Mapping: https://en.wikipedia.org/wiki/Object-relational_mapping
-.. _SQLAlchemy: https://www.sqlalchemy.org/
-.. _sqlalchemy-cratedb: https://github.com/crate-workbench/sqlalchemy-cratedb