pycapnp 2.0.0b2__tar.gz → 2.2.0__tar.gz

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/CHANGELOG.md

@@ -1,7 +1,28 @@
+## v2.2.0 (2025-09-12)
+- Add binary support in dictionaries via base64 encoding (#351)
+- Add structure-free read_multiple_bytes_packed (#378)
+- Support python custom message builder and make Data field's type return MemoryView (#380)
+
+## v2.1.0 (2025-09-04)
+- Add Python 3.13 support
+  * Python 3.8 is still enabled but will be disabled if changes are needed that prevent compatibility with newer versions of Python (e.g. 3.14)
+  * Disabling experimental Python 3.14 build as it currently causes build issues
+- Upgrade to Cython version 3
+- Include \_custom_build in sdist
+- Remove usage of deprecated kj::mvCapture functions
+- Make license information SPDX-compatible
+- Generate a new certificate that is compatible with strict x509 checking
+- Avoid storm of 'warning: moving a temporary object prevents copy elision'
+- cibuildwheel updates
+- Fix deprecation warning when importing a schema
+
+## v2.0.0 (2024-01-19)
+- Updated link for mailing list in README
+
 ## v2.0.0b2 (2023-11-25)
 - Fix broken test in test_load (#329)
 - Update README example to async code (#331)
-- Fix 'AttributeError: '_UnixSelectorEventLoop' object has no attribute 'call_soon'
+- Fix 'AttributeError: '\_UnixSelectorEventLoop' object has no attribute 'call_soon'
 - Delete and update some Python 3.7-specific todo notes
 - Make a server fail early when the KJ loop is not running
 - Update documentation to async code (#331) (#332)

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/MANIFEST.in

@@ -3,6 +3,7 @@ include LICENSE.md
 include CHANGELOG.md
 include requirements.txt
 include buildutils/*
+include _custom_build/*
 include capnp/lib/capnp_api.h
 include Pipfile
 include tox.ini

{pycapnp-2.0.0b2/pycapnp.egg-info → pycapnp-2.2.0}/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pycapnp
-Version: 2.0.0b2
+Version: 2.2.0
 Summary: A cython wrapping of the C++ Cap'n Proto library
 Home-page: https://github.com/capnproto/pycapnp
-Download-URL: https://github.com/haata/pycapnp/archive/v2.0.0b2.zip
+Download-URL: https://github.com/haata/pycapnp/archive/v2.2.0.zip
 Author: Jacob Alexander
 Author-email: haata@kiibohd.com
-License: BSD
+License: BSD-2-Clause
 Keywords: capnp,capnproto,Cap'n Proto,pycapnp
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Classifier: Operating System :: POSIX
@@ -26,6 +25,18 @@ Classifier: Topic :: Communications
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # pycapnp
 
@@ -33,7 +44,7 @@ License-File: LICENSE.md
 [![manylinux2014 Status](https://github.com/capnproto/pycapnp/workflows/manylinux2014/badge.svg)](https://github.com/capnproto/pycapnp/actions)
 [![PyPI version](https://badge.fury.io/py/pycapnp.svg)](https://badge.fury.io/py/pycapnp)
 
-[Cap'n'proto Mailing List](https://groups.google.com/forum/#!forum/capnproto) [Documentation](https://capnproto.github.io/pycapnp)
+[Cap'n'proto Mailing List](https://github.com/capnproto/capnproto/discussions) [Documentation](https://capnproto.github.io/pycapnp)
 
 
 ## Requirements
@@ -248,10 +259,31 @@ if __name__ == '__main__':
 
 Changelog
 =============
+## v2.2.0 (2025-09-12)
+- Add binary support in dictionaries via base64 encoding (#351)
+- Add structure-free read_multiple_bytes_packed (#378)
+- Support python custom message builder and make Data field's type return MemoryView (#380)
+
+## v2.1.0 (2025-09-04)
+- Add Python 3.13 support
+  * Python 3.8 is still enabled but will be disabled if changes are needed that prevent compatibility with newer versions of Python (e.g. 3.14)
+  * Disabling experimental Python 3.14 build as it currently causes build issues
+- Upgrade to Cython version 3
+- Include \_custom_build in sdist
+- Remove usage of deprecated kj::mvCapture functions
+- Make license information SPDX-compatible
+- Generate a new certificate that is compatible with strict x509 checking
+- Avoid storm of 'warning: moving a temporary object prevents copy elision'
+- cibuildwheel updates
+- Fix deprecation warning when importing a schema
+
+## v2.0.0 (2024-01-19)
+- Updated link for mailing list in README
+
 ## v2.0.0b2 (2023-11-25)
 - Fix broken test in test_load (#329)
 - Update README example to async code (#331)
-- Fix 'AttributeError: '_UnixSelectorEventLoop' object has no attribute 'call_soon'
+- Fix 'AttributeError: '\_UnixSelectorEventLoop' object has no attribute 'call_soon'
 - Delete and update some Python 3.7-specific todo notes
 - Make a server fail early when the KJ loop is not running
 - Update documentation to async code (#331) (#332)

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/README.md

@@ -4,7 +4,7 @@
 [![manylinux2014 Status](https://github.com/capnproto/pycapnp/workflows/manylinux2014/badge.svg)](https://github.com/capnproto/pycapnp/actions)
 [![PyPI version](https://badge.fury.io/py/pycapnp.svg)](https://badge.fury.io/py/pycapnp)
 
-[Cap'n'proto Mailing List](https://groups.google.com/forum/#!forum/capnproto) [Documentation](https://capnproto.github.io/pycapnp)
+[Cap'n'proto Mailing List](https://github.com/capnproto/capnproto/discussions) [Documentation](https://capnproto.github.io/pycapnp)
 
 
 ## Requirements

pycapnp-2.2.0/_custom_build/backend.py

@@ -0,0 +1,31 @@
+import sys
+
+from setuptools.build_meta import *  # noqa: F401, F403
+from setuptools.build_meta import build_wheel
+
+backend_class = build_wheel.__self__.__class__
+
+
+class _CustomBuildMetaBackend(backend_class):
+    def run_setup(self, setup_script="setup.py"):
+        if self.config_settings:
+            flags = []
+            if self.config_settings.get("force-bundled-libcapnp"):
+                flags.append("--force-bundled-libcapnp")
+            if self.config_settings.get("force-system-libcapnp"):
+                flags.append("--force-system-libcapnp")
+            if self.config_settings.get("libcapnp-url"):
+                flags.append("--libcapnp-url")
+                flags.append(self.config_settings["libcapnp-url"])
+            if flags:
+                sys.argv = sys.argv[:1] + ["build_ext"] + flags + sys.argv[1:]
+        return super().run_setup(setup_script)
+
+    def build_wheel(
+        self, wheel_directory, config_settings=None, metadata_directory=None
+    ):
+        self.config_settings = config_settings
+        return super().build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+build_wheel = _CustomBuildMetaBackend().build_wheel

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/__init__.py

@@ -31,6 +31,7 @@ Example Usage::
         for phone in person.phones:
             print(phone.type, ':', phone.number)
 """
+
 # flake8: noqa F401 F403 F405
 from .version import version as __version__
 from .lib.capnp import *
@@ -47,6 +48,7 @@ from .lib.capnp import (
     _InterfaceModule,
     _ListSchema,
     _MallocMessageBuilder,
+    _PyCustomMessageBuilder,
     _PackedFdMessageReader,
     _StreamFdMessageReader,
     _StructModule,

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/helpers/capabilityHelper.cpp

@@ -68,14 +68,14 @@ kj::Promise<kj::Own<PyRefCounter>> wrapPyFunc(kj::Own<PyRefCounter> func, kj::Ow
 ::kj::Promise<kj::Own<PyRefCounter>> then(kj::Promise<kj::Own<PyRefCounter>> promise,
                                           kj::Own<PyRefCounter> func, kj::Own<PyRefCounter> error_func) {
   if(error_func->obj == Py_None)
-    return promise.then(kj::mvCapture(func, [](auto func, kj::Own<PyRefCounter> arg) {
-      return wrapPyFunc(kj::mv(func), kj::mv(arg)); } ));
+    return promise.then([func=kj::mv(func)](kj::Own<PyRefCounter> arg) mutable {
+      return wrapPyFunc(kj::mv(func), kj::mv(arg)); } );
   else
     return promise.then
-      (kj::mvCapture(func, [](auto func, kj::Own<PyRefCounter> arg) {
-        return wrapPyFunc(kj::mv(func), kj::mv(arg)); }),
-        kj::mvCapture(error_func, [](auto error_func, kj::Exception arg) {
-          return wrapPyFunc(kj::mv(error_func), stealPyRef(wrap_kj_exception(arg))); } ));
+      ([func=kj::mv(func)](kj::Own<PyRefCounter> arg) mutable {
+        return wrapPyFunc(kj::mv(func), kj::mv(arg)); },
+        [error_func=kj::mv(error_func)](kj::Exception arg) mutable {
+          return wrapPyFunc(kj::mv(error_func), stealPyRef(wrap_kj_exception(arg))); } );
 }
 
 kj::Promise<void> PythonInterfaceDynamicImpl::call(capnp::InterfaceSchema::Method method,

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/helpers/helpers.pxd

@@ -16,9 +16,6 @@ cdef extern from "capnp/helpers/fixMaybe.h":
 
 cdef extern from "capnp/helpers/capabilityHelper.h":
     PyPromise then(PyPromise promise, Own[PyRefCounter] func, Own[PyRefCounter] error_func)
-    DynamicCapability.Client new_client(InterfaceSchema&, PyObject *)
-    DynamicValue.Reader new_server(InterfaceSchema&, PyObject *)
-    Capability.Client server_to_client(InterfaceSchema&, PyObject *)
     PyPromise convert_to_pypromise(RemotePromise)
     PyPromise convert_to_pypromise(VoidPromise)
     VoidPromise taskToPromise(Own[PyRefCounter] coroutine, PyObject* callback)
@@ -26,11 +23,11 @@ cdef extern from "capnp/helpers/capabilityHelper.h":
     void init_capnp_api()
 
 cdef extern from "capnp/helpers/rpcHelper.h":
-    Capability.Client bootstrapHelper(RpcSystem&)
-    Capability.Client bootstrapHelperServer(RpcSystem&)
+    Own[Capability.Client] bootstrapHelper(RpcSystem&) except +reraise_kj_exception
+    Own[Capability.Client] bootstrapHelperServer(RpcSystem&) except +reraise_kj_exception
 
 cdef extern from "capnp/helpers/serialize.h":
-    ByteArray messageToPackedBytes(MessageBuilder &, size_t wordCount)
+    ByteArray messageToPackedBytes(MessageBuilder &, size_t wordCount) except +reraise_kj_exception
 
 cdef extern from "capnp/helpers/deserialize.h":
     Node.Reader toReader(DynamicStruct.Reader reader) except +reraise_kj_exception

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/helpers/rpcHelper.h

@@ -6,16 +6,16 @@
 #include "Python.h"
 #include "capabilityHelper.h"
 
-capnp::Capability::Client bootstrapHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
+kj::Own<capnp::Capability::Client> bootstrapHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
     capnp::MallocMessageBuilder hostIdMessage(8);
     auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
     hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
-    return client.bootstrap(hostId);
+    return kj::heap<capnp::Capability::Client>(client.bootstrap(hostId));
 }
 
-capnp::Capability::Client bootstrapHelperServer(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
+kj::Own<capnp::Capability::Client> bootstrapHelperServer(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
     capnp::MallocMessageBuilder hostIdMessage(8);
     auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
     hostId.setSide(capnp::rpc::twoparty::Side::CLIENT);
-    return client.bootstrap(hostId);
+    return kj::heap<capnp::Capability::Client>(client.bootstrap(hostId));
 }

pycapnp-2.2.0/capnp/includes/PyCustomMessageBuilder.cpp

@@ -0,0 +1,50 @@
+#include "PyCustomMessageBuilder.h"
+#include <stdexcept>
+
+namespace capnp {
+
+PyCustomMessageBuilder::PyCustomMessageBuilder(
+    PyObject* allocateSegmentCallable, uint firstSegmentWords)
+    : allocateSegmentCallable(allocateSegmentCallable), firstSize(firstSegmentWords)
+{
+  KJ_REQUIRE(PyCallable_Check(allocateSegmentCallable),
+               "allocateSegmentCallable must be callable");
+  Py_INCREF(allocateSegmentCallable);
+}
+
+PyCustomMessageBuilder::~PyCustomMessageBuilder() noexcept(false) {
+  PyGILState_STATE gstate = PyGILState_Ensure();
+
+  for (auto* obj : allocatedBuffers) {
+    Py_DECREF(obj);
+  }
+  allocatedBuffers.clear();
+
+  Py_DECREF(allocateSegmentCallable);
+  PyGILState_Release(gstate);
+}
+
+kj::ArrayPtr<capnp::word> PyCustomMessageBuilder::allocateSegment(capnp::uint minimumSize) {
+  PyGILState_STATE gstate = PyGILState_Ensure();
+  KJ_DEFER({ PyGILState_Release(gstate); });
+  if (curSize == 0) {
+    minimumSize = kj::max(minimumSize, firstSize);
+  }
+  PyObject* pyBufObj = PyObject_CallFunction(allocateSegmentCallable, "I", minimumSize);
+  KJ_REQUIRE(pyBufObj, "PyCustomMessageBuilder: allocateSegment failed");
+  allocatedBuffers.push_back(pyBufObj);
+
+
+  Py_buffer view;
+  int bufRes = PyObject_GetBuffer(pyBufObj, &view, PyBUF_SIMPLE);
+  KJ_REQUIRE(bufRes == 0, "PyCustomMessageBuilder: object does not support buffer protocol");
+  KJ_DEFER({ PyBuffer_Release(&view); });
+
+  size_t byteCount = view.len;
+  size_t wordCount = byteCount / sizeof(capnp::word);
+  KJ_REQUIRE(wordCount >= minimumSize, "PyCustomMessageBuilder: buffer too small for minimumSize");
+  curSize += wordCount;
+  return kj::arrayPtr(reinterpret_cast<capnp::word*>(view.buf), wordCount);
+}
+
+}

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/includes/capnp_cpp.pxd

@@ -57,26 +57,12 @@ cdef extern from "kj/async.h" namespace " ::kj":
     cdef cppclass Promise[T] nogil:
         Promise(Promise)
         Promise(T)
-        T wait(WaitScope) except +reraise_kj_exception
-        bool poll(WaitScope) except +reraise_kj_exception
-        # ForkedPromise<T> fork()
-        # Promise<T> exclusiveJoin(Promise<T>&& other)
-        # Promise[T] eagerlyEvaluate()
-        # void detach(ErrorFunc)
         String trace()
         Promise[T] attach(Own[PyRefCounter] &)
         Promise[T] attach(Own[PyRefCounter] &, Own[PyRefCounter] &)
         Promise[T] attach(Own[PyRefCounter] &, Own[PyRefCounter] &, Own[PyRefCounter] &)
         Promise[T] attach(Own[PyRefCounter] &, Own[PyRefCounter] &, Own[PyRefCounter] &, Own[PyRefCounter] &)
 
-    cdef cppclass Canceler nogil:
-        Canceler()
-        Promise[T] wrap[T](Promise[T] promise)
-        void cancel(StringPtr cancelReason)
-        void cancel(Exception& exception)
-        void release()
-        bool isEmpty()
-
 ctypedef Promise[Own[PyRefCounter]] PyPromise
 ctypedef Promise[void] VoidPromise
 
@@ -109,8 +95,8 @@ cdef extern from "kj/array.h" namespace " ::kj":
 
 cdef extern from "kj/async-io.h" namespace " ::kj":
     cdef cppclass AsyncIoStream nogil:
-        Promise[size_t] read(void*, size_t, size_t)
-        Promise[void] write(const void*, size_t)
+        Promise[size_t] read(void*, size_t, size_t) except +reraise_kj_exception
+        Promise[void] write(const void*, size_t) except +reraise_kj_exception
 
 cdef extern from "capnp/schema.capnp.h" namespace " ::capnp":
     enum TypeWhich" ::capnp::schema::Type::Which":
@@ -297,7 +283,7 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
             Client()
             Client(Client&)
             Client(Own[PythonInterfaceDynamicImpl])
-            Client upcast(InterfaceSchema requestedSchema)
+            Client upcast(InterfaceSchema requestedSchema) except +reraise_kj_exception
             DynamicCapability.Client castAs"castAs< ::capnp::DynamicCapability>"(InterfaceSchema)
             InterfaceSchema getSchema()
             Request newRequest(char * methodName)
@@ -448,7 +434,7 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
             Type getType()
 
 cdef extern from "capnp/schema-loader.h" namespace " ::capnp":
-    cdef cppclass SchemaLoader:
+    cdef cppclass SchemaLoader nogil:
         SchemaLoader()
         Schema load(Node.Reader reader) except +reraise_kj_exception
         Schema get(uint64_t id_) except +reraise_kj_exception

{pycapnp-2.0.0b2 → pycapnp-2.2.0}/capnp/includes/schema_cpp.pxd

@@ -673,7 +673,7 @@ cdef extern from "capnp/message.h" namespace " ::capnp":
         Annotation.Builder getRootAnnotation'getRoot< ::capnp::schema::Annotation>'()
         Annotation.Builder initRootAnnotation'initRoot< ::capnp::schema::Annotation>'()
 
-        DynamicStruct_Builder getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema)
+        DynamicStruct_Builder getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema) except +reraise_kj_exception
         DynamicStruct_Builder initRootDynamicStruct'initRoot< ::capnp::DynamicStruct>'(StructSchema)
         void setRootDynamicStruct'setRoot< ::capnp::DynamicStruct::Reader>'(DynamicStruct.Reader)
 
@@ -696,7 +696,7 @@ cdef extern from "capnp/message.h" namespace " ::capnp":
         StructNode.Reader getRootStructNode'getRoot< ::capnp::schema::StructNode>'()
         Annotation.Reader getRootAnnotation'getRoot< ::capnp::schema::Annotation>'()
 
-        DynamicStruct.Reader getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema)
+        DynamicStruct.Reader getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema) except +reraise_kj_exception
         AnyPointer.Reader getRootAnyPointer'getRoot< ::capnp::AnyPointer>'()
 
     cdef cppclass MallocMessageBuilder(MessageBuilder) nogil:
@@ -714,6 +714,11 @@ cdef extern from "capnp/message.h" namespace " ::capnp":
     enum Void:
         VOID
 
+cdef extern from "PyCustomMessageBuilder.h" namespace " ::capnp":
+    cdef cppclass PyCustomMessageBuilder(MessageBuilder):
+        PyCustomMessageBuilder(PyObject* allocateSegmentCallable)
+        PyCustomMessageBuilder(PyObject* allocateSegmentCallable, int firstSegmentSize)
+
 cdef extern from "capnp/common.h" namespace " ::capnp":
     cdef cppclass word nogil:
         pass
@@ -798,7 +803,7 @@ cdef extern from "capnp/serialize.h" namespace " ::capnp":
         FlatArrayMessageReader(WordArrayPtr array, ReaderOptions) except +reraise_kj_exception
         const word* getEnd() const
 
-    void writeMessageToFd(int, MessageBuilder&) nogil except +reraise_kj_exception
+    void writeMessageToFd(int, MessageBuilder&) except +reraise_kj_exception nogil
 
     WordArray messageToFlatArray(MessageBuilder &) nogil
 
@@ -816,6 +821,6 @@ cdef extern from "capnp/serialize-packed.h" namespace " ::capnp":
         PackedFdMessageReader(int) except +reraise_kj_exception
         PackedFdMessageReader(int, ReaderOptions) except +reraise_kj_exception
 
-    void writePackedMessage(BufferedOutputStream&, MessageBuilder&) nogil except +reraise_kj_exception
-    void writePackedMessage(OutputStream&, MessageBuilder&) nogil except +reraise_kj_exception
-    void writePackedMessageToFd(int, MessageBuilder&) nogil except +reraise_kj_exception
+    void writePackedMessage(BufferedOutputStream&, MessageBuilder&) except +reraise_kj_exception nogil
+    void writePackedMessage(OutputStream&, MessageBuilder&) except +reraise_kj_exception nogil
+    void writePackedMessageToFd(int, MessageBuilder&) except +reraise_kj_exception nogil