amalgam-lang 16.0.0__py3-none-macosx_12_0_x86_64.whl → 16.1.0__py3-none-macosx_12_0_x86_64.whl

amalgam/api.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from ctypes import (
-    _Pointer, Array, byref, c_bool, c_char, c_char_p, c_double, c_size_t, c_uint64, c_void_p,
+    _Pointer, Array, byref, c_bool, c_char, c_char_p, c_size_t, c_uint64, c_void_p,
     cast, cdll, POINTER, Structure
 )
 from datetime import datetime
@@ -55,8 +55,8 @@ class LoadEntityStatus:
             self.version = ""
         else:
             self.loaded = bool(c_status.loaded)
-            self.message = api.char_p_to_bytes(c_status.message).decode("utf-8")
-            self.version = api.char_p_to_bytes(c_status.version).decode("utf-8")
+            self.message = api.char_p_to_str(c_status.message)
+            self.version = api.char_p_to_str(c_status.version)
 
     def __str__(self) -> str:
         """
@@ -70,6 +70,57 @@ class LoadEntityStatus:
         return f"{self.loaded},\"{self.message}\",\"{self.version}\""
 
 
+class _ResultWithLog(Structure):
+    """The C-native version of :class:`ResultWithLog`."""
+    _fields_ = [
+        ("json", POINTER(c_char)),
+        ("log", POINTER(c_char))
+    ]
+
+
+class ResultWithLog:
+    """
+    Return value from :func:`~api.Amalgam.execute_entity_json_logged`.
+
+    Parameters
+    ----------
+    json : str | None
+        The JSON-format response from the Amalgam invocation.
+    log : str | None
+        The Amalgam-syntax transaction-log entry.
+    """
+
+    def __init__(self, *, json: str | None, log: str | None):
+        self.json = json
+        """The JSON-format response from the Amalgam invocation."""
+
+        self.log = log
+        """The Amalgam-syntax transaction-log entry."""
+
+    @classmethod
+    def from_c_result(cls, api: Amalgam, c_result: _ResultWithLog) -> t.Self:
+        """
+        Construct a `ResultWithLog` from the raw C result.
+
+        Frees the strings in the C result.
+
+        Parameters
+        ----------
+        api : Amalgam
+            The Amalgam API layer.
+        c_result: _ResultWithLog
+            The raw C result structure.
+
+        Returns
+        -------
+        ResultWithLog
+            A populated Python-side structure.
+        """
+        json = api.char_p_to_str(c_result.json)
+        log = api.char_p_to_str(c_result.log)
+        return cls(json=json, log=log)
+
+
 class Amalgam:
     """
     A general python direct interface to the Amalgam library.
@@ -625,6 +676,29 @@ class Amalgam:
 
         return bytes_str
 
+    def char_p_to_str(self, p: _Pointer[c_char] | c_char_p) -> str | None:
+        """
+        Copy native C char pointer to UTF-8-encoded string, cleaning up memory correctly.
+
+        Parameters
+        ----------
+        p : c_char_p
+            The char pointer to convert
+
+        Returns
+        -------
+        str or None
+            The resulting string
+        """
+        b = self.char_p_to_bytes(p)
+        s: str | None = None
+        if b is not None:
+            try:
+                s = b.decode("UTF-8")
+            except UnicodeDecodeError:
+                s = None
+        return s
+
     def get_json_from_label(self, handle: str, label: str) -> bytes:
         """
         Get a label from amalgam and returns it in json format.
@@ -1058,6 +1132,56 @@ class Amalgam:
 
         return result
 
+    def execute_entity_json_logged(
+        self,
+        handle: str,
+        label: str,
+        json: str | bytes
+    ) -> ResultWithLog:
+        """
+        Execute a label, and also return a transaction log.
+
+        Parameters
+        ----------
+        handle : str
+            The handle of the amalgam entity.
+
+        label : str
+            The label to execute.
+        json : str or bytes
+            A json representation of parameters for the label to be executed.
+
+        Returns
+        -------
+        ResultWithLog
+            Both a JSON-encoded response and the Amalgam-format transaction log entry.
+
+        """
+        self.amlg.ExecuteEntityJsonPtrLogged.restype = _ResultWithLog
+        self.amlg.ExecuteEntityJsonPtrLogged.argtypes = [
+            c_char_p, c_char_p, c_char_p]
+        handle_buf = self.str_to_char_p(handle)
+        label_buf = self.str_to_char_p(label)
+        json_buf = self.str_to_char_p(json)
+
+        self._log_time("EXECUTION START")
+        self._log_execution((
+            "EXECUTE_ENTITY_JSON_LOGGED "
+            f"\"{self.escape_double_quotes(handle)}\" "
+            f"\"{self.escape_double_quotes(label)}\" "
+            f"{json}"
+        ))
+        result = ResultWithLog.from_c_result(self, self.amlg.ExecuteEntityJsonPtrLogged(
+            handle_buf, label_buf, json_buf))
+        self._log_time("EXECUTION STOP")
+        self._log_reply(result)
+
+        del handle_buf
+        del label_buf
+        del json_buf
+
+        return result
+
     def eval_on_entity(
         self,
         handle: str,

amalgam/lib/darwin/amd64/docs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "58.0.0"
+  "version": "58.1.1"
 }

amalgam/lib/version.json

@@ -1,8 +1,8 @@
 {
   "version": {
-    "amalgam": "58.0.0",
-    "amalgam_sha": "f797e187f376c7a45cc70be01a253edef8d01e5e",
-    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/58.0.0",
+    "amalgam": "58.1.1",
+    "amalgam_sha": "410684e7abf7872f0fbd37acf53155c69c534111",
+    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/58.1.1",
     "amalgam_build_date": "",
     "amalgam_display_title": ""
   }

{amalgam_lang-16.0.0.dist-info → amalgam_lang-16.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: amalgam-lang
-Version: 16.0.0
+Version: 16.1.0
 Summary: A direct interface with Amalgam compiled DLL, dylib, or so.
 Author: Howso Incorporated
 Author-email: support@howso.com

amalgam_lang-16.1.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
+amalgam/api.py,sha256=bVIMAuMsb55ELy6Ja1UmR3kqajfmPZbpFFBKjzVKT2o,42697
+amalgam/lib/version.json,sha256=ggK6Zwl5Z1zN8z7fYTYuzQuap3qN0mzd2Yl-hlIiEgo,250
+amalgam/lib/darwin/amd64/amalgam-mt-noavx.dylib,sha256=RFzzfGnde7ZyWn8enRnNm0Namw3b_-9iPQ0VgtyLvvI,3463032
+amalgam/lib/darwin/amd64/amalgam-mt.dylib,sha256=URB4fk-XEMLLv0GLVxpRC5_1Ce2Pbrswp6RTXmtnAAQ,3785008
+amalgam/lib/darwin/amd64/amalgam-omp.dylib,sha256=tOw6vYbhxapfqOIzK-iDnMph-6nSk1XPUDGQTAShL9w,4167936
+amalgam/lib/darwin/amd64/amalgam-st.dylib,sha256=Qdoza36VmKKouFPojJY5KK-cUo_E94qeG1FsOGYaHrc,3630792
+amalgam/lib/darwin/amd64/docs/version.json,sha256=ayfGJDNHt-UaNSy3ODSSETY0WK11GxIfz796ALRtUF8,25
+amalgam_lang-16.1.0.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+amalgam_lang-16.1.0.dist-info/METADATA,sha256=C-Al2wnKqoV0HiHuCYIHNbQu4N9XEcSUHdjBg0MULrM,43807
+amalgam_lang-16.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+amalgam_lang-16.1.0.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
+amalgam_lang-16.1.0.dist-info/RECORD,,

{amalgam_lang-16.0.0.dist-info → amalgam_lang-16.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

amalgam_lang-16.0.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
-amalgam/api.py,sha256=-iK6AmVZk5fJuBVRmllT3Jmv-GbGq2I7XKIURo-ByO0,39296
-amalgam/lib/version.json,sha256=ZqDqmXt4mkYPFUFGe-DKdmBQztBXr9lZNPP3mXjHhV4,250
-amalgam/lib/darwin/amd64/amalgam-mt-noavx.dylib,sha256=LEdma0lgtQ34yYCcUym0wDGP2KFAh8OnU5e4v2DPurw,3481520
-amalgam/lib/darwin/amd64/amalgam-mt.dylib,sha256=fdqqIfhPK9GxbYBys_HJNzUDGUQwwfYwKbYEXb9COK8,3803504
-amalgam/lib/darwin/amd64/amalgam-omp.dylib,sha256=8oW-E9rgXgiwvolYbomIWQ1LHOF3GEb3Cj5uwTtPMd0,4195400
-amalgam/lib/darwin/amd64/amalgam-st.dylib,sha256=2TPKysg_XeAJbX5dgiQtGc5eAJC06jzHxEmwf57-1Rw,3674656
-amalgam/lib/darwin/amd64/docs/version.json,sha256=vkT3SE1CNlzjDD1Twp5CLdApAO1e4MYnFbnLN41BW5I,25
-amalgam_lang-16.0.0.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-amalgam_lang-16.0.0.dist-info/METADATA,sha256=nLchDWzZVCctfoyVN8AYZCOLZSLOXk5tEfe6Jv1dfps,43807
-amalgam_lang-16.0.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-amalgam_lang-16.0.0.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
-amalgam_lang-16.0.0.dist-info/RECORD,,