amalgam-lang 24.0.0__py3-none-win_amd64.whl → 24.1.1__py3-none-win_amd64.whl

amalgam/api.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from base64 import b64encode
 from ctypes import (
     _Pointer, Array, byref, c_bool, c_char, c_char_p, c_size_t, c_uint64, c_void_p,
-    cast, cdll, POINTER, Structure
+    cast, cdll, POINTER, Structure, string_at
 )
 from datetime import datetime
 import gc
@@ -28,7 +29,9 @@ class _LoadEntityStatus(Structure):
     _fields_ = [
         ("loaded", c_bool),
         ("message", POINTER(c_char)),
-        ("version", POINTER(c_char))
+        ("version", POINTER(c_char)),
+        ("entity_path", POINTER(POINTER(c_char))),
+        ("entity_path_len", c_size_t)
     ]
 
 
@@ -53,10 +56,14 @@ class LoadEntityStatus:
             self.loaded = True
             self.message = ""
             self.version = ""
+            self.entity_path = []
         else:
             self.loaded = bool(c_status.loaded)
             self.message = api.char_p_to_str(c_status.message)
             self.version = api.char_p_to_str(c_status.version)
+            self.entity_path = [api.char_p_to_str(c_status.entity_path[i]) for i in range(c_status.entity_path_len)]
+            api.amlg.DeleteString(cast(c_status.entity_path, c_char_p))
+
 
     def __str__(self) -> str:
         """
@@ -67,7 +74,11 @@ class LoadEntityStatus:
         str
             The human-readable string representation.
         """
-        return f"{self.loaded},\"{self.message}\",\"{self.version}\""
+        ep = ""
+        if self.entity_path:
+            eps = (f'"{step}"' for step in self.entity_path)
+            ep = f",[{','.join(eps)}]"
+        return f"{self.loaded},\"{self.message}\",\"{self.version}\"{ep}"
 
 
 class _ResultWithLog(Structure):
@@ -617,7 +628,7 @@ class Amalgam:
         if self.trace:
             self.trace.write(execution_string + b"\n")
             self.trace.flush()
-    
+
     def _log_execution_std(self, command: bytes, *args: str, suffix: str | bytes | None = None) -> None:
         """
         Log an execution string in a canonical form.
@@ -803,7 +814,8 @@ class Amalgam:
         persist: bool = False,
         json_file_params: str = "",
         write_log: str = "",
-        print_log: str = ""
+        print_log: str = "",
+        entity_path: list[str] | None = None,
     ) -> LoadEntityStatus:
         """
         Load an entity from an amalgam source file.
@@ -829,6 +841,9 @@ class Amalgam:
         print_log : str, default ""
             Path to the print log. If empty string, the print log is
             not generated.
+        entity_path: list[str], optional
+            If provided and non-empty, load the content into an entity
+            contained within `handle` at this path.
 
         Returns
         -------
@@ -836,7 +851,8 @@ class Amalgam:
             Status of LoadEntity call.
         """
         self.amlg.LoadEntity.argtypes = [
-            c_char_p, c_char_p, c_char_p, c_bool, c_char_p, c_char_p, c_char_p]
+            c_char_p, c_char_p, c_char_p, c_bool, c_char_p, c_char_p, c_char_p, POINTER(c_char_p),
+            c_size_t]
         self.amlg.LoadEntity.restype = _LoadEntityStatus
         handle_buf = self.str_to_char_p(handle)
         file_path_buf = self.str_to_char_p(file_path)
@@ -844,18 +860,26 @@ class Amalgam:
         json_file_params_buf = self.str_to_char_p(json_file_params)
         write_log_buf = self.str_to_char_p(write_log)
         print_log_buf = self.str_to_char_p(print_log)
+        entity_path_p = None
+        entity_path_len = 0
+
+        if entity_path is not None and len(entity_path) > 0:
+            entity_path_len = len(entity_path)
+            entity_path_p = (c_char_p * entity_path_len)()
+            for i, entry in enumerate(entity_path):
+                entity_path_p[i] = cast(self.str_to_char_p(entry), c_char_p)
 
         self.load_command_log_entry = (
             f"LOAD_ENTITY \"{self.escape_double_quotes(handle)}\" "
             f"\"{self.escape_double_quotes(file_path)}\" "
             f"\"{self.escape_double_quotes(file_type)}\" {str(persist).lower()} "
             f"{json_lib.dumps(json_file_params)} "
-            f"\"{write_log}\" \"{print_log}\""
+            f"\"{write_log}\" \"{print_log}\" \"\" \"{' '.join(entity_path or [])}\""
         ).encode()
         self._log_execution(self.load_command_log_entry)
         result = LoadEntityStatus(self, self.amlg.LoadEntity(
             handle_buf, file_path_buf, file_type_buf, persist,
-            json_file_params_buf, write_log_buf, print_log_buf))
+            json_file_params_buf, write_log_buf, print_log_buf, entity_path_p, entity_path_len))
         self._log_reply(result)
 
         del handle_buf
@@ -864,6 +888,98 @@ class Amalgam:
         del json_file_params_buf
         del write_log_buf
         del print_log_buf
+        if entity_path_p is not None:
+            for i in range(entity_path_len):
+                entry_buf = entity_path_p[i]
+                del entry_buf
+            del entity_path_p
+        self.gc()
+
+        return result
+
+    def load_entity_from_memory(
+        self,
+        handle: str,
+        contents: bytes,
+        *,
+        file_type: str,
+        json_file_params: str = "",
+        write_log: str = "",
+        print_log: str = "",
+        entity_path: list[str] | None = None,
+    ) -> LoadEntityStatus:
+        """
+        Load an entity from an in-memory buffer.
+
+        Parameters
+        ----------
+        handle : str
+            The handle to assign the entity.
+        contents : bytes
+            The content to load.
+        file_type : str
+            The type of file to store, typically ``"amlg"`` for plain-text Amalgam or ``"caml"``
+            for binary compressed Amalgam.
+        json_file_params : str, default ""
+            Either empty string or a string of json specifying a set of key-value pairs
+            which are parameters specific to the file type.  See Amalgam documentation
+            for details of allowed parameters.
+        write_log : str, default ""
+            Path to the write log. If empty string, the write log is
+            not generated.
+        print_log : str, default ""
+            Path to the print log. If empty string, the print log is
+            not generated.
+        entity_path: list[str], optional
+            If provided and non-empty, load the content into an entity
+            contained within `handle` at this path.
+
+        Returns
+        -------
+        LoadEntityStatus
+            Status of LoadEntity call.
+        """
+        self.amlg.LoadEntityFromMemory.argtypes = [
+            c_char_p, c_void_p, c_size_t, c_char_p, c_bool, c_char_p, c_char_p, c_char_p, POINTER(c_char_p),
+            c_size_t]
+        self.amlg.LoadEntityFromMemory.restype = _LoadEntityStatus
+        handle_buf = self.str_to_char_p(handle)
+        file_type_buf = self.str_to_char_p(file_type)
+        json_file_params_buf = self.str_to_char_p(json_file_params)
+        write_log_buf = self.str_to_char_p(write_log)
+        print_log_buf = self.str_to_char_p(print_log)
+        entity_path_p = None
+        entity_path_len = 0
+
+        if entity_path is not None and len(entity_path) > 0:
+            entity_path_len = len(entity_path)
+            entity_path_p = (c_char_p * entity_path_len)()
+            for i, entry in enumerate(entity_path):
+                entity_path_p[i] = cast(self.str_to_char_p(entry), c_char_p)
+
+        self.load_command_log_entry = (
+            f"LOAD_ENTITY_FROM_MEMORY \"{self.escape_double_quotes(handle)}\" "
+            f"\"{b64encode(contents).decode()}\" "
+            f"\"{self.escape_double_quotes(file_type)}\" false "
+            f"{json_lib.dumps(json_file_params)} "
+            f"\"{write_log}\" \"{print_log}\" \"\" \"{' '.join(entity_path or [])}\""
+        ).encode()
+        self._log_execution(self.load_command_log_entry)
+        result = LoadEntityStatus(self, self.amlg.LoadEntityFromMemory(
+            handle_buf, contents, len(contents), file_type_buf, False,
+            json_file_params_buf, write_log_buf, print_log_buf, entity_path_p, entity_path_len))
+        self._log_reply(result)
+
+        del handle_buf
+        del file_type_buf
+        del json_file_params_buf
+        del write_log_buf
+        del print_log_buf
+        if entity_path_p is not None:
+            for i in range(entity_path_len):
+                entry_buf = entity_path_p[i]
+                del entry_buf
+            del entity_path_p
         self.gc()
 
         return result
@@ -1050,6 +1166,7 @@ class Amalgam:
         file_type: str = "",
         persist: bool = False,
         json_file_params: str = "",
+        entity_path: list[str] | None = None,
     ):
         """
         Store entity to the file type specified within file_path.
@@ -1069,25 +1186,116 @@ class Amalgam:
             Either empty string or a string of json specifying a set of key-value pairs
             which are parameters specific to the file type.  See Amalgam documentation
             for details of allowed parameters.
+        entity_path: list[str], optional
+            If provided and non-empty, store the content from an entity
+            contained within `handle` at this path.
         """
         self.amlg.StoreEntity.argtypes = [
-            c_char_p, c_char_p, c_char_p, c_bool, c_char_p]
+            c_char_p, c_char_p, c_char_p, c_bool, c_char_p, POINTER(c_char_p), c_size_t]
+        self.amlg.StoreEntity.restype = None
         handle_buf = self.str_to_char_p(handle)
         file_path_buf = self.str_to_char_p(file_path)
         file_type_buf = self.str_to_char_p(file_type)
         json_file_params_buf = self.str_to_char_p(json_file_params)
+        entity_path_p = None
+        entity_path_len = 0
+
+        if entity_path is not None and len(entity_path) > 0:
+            entity_path_len = len(entity_path)
+            entity_path_p = (c_char_p * entity_path_len)()
+            for i, entry in enumerate(entity_path):
+                entity_path_p[i] = self.str_to_char_p(entry)
 
         self._log_execution_std(b"STORE_ENTITY", handle, file_path, file_type,
-                                suffix=f"{str(persist).lower()} {json_lib.dumps(json_file_params)}")
+                                suffix=f"{str(persist).lower()} {json_lib.dumps(json_file_params)} \"{' '.join(entity_path or [])}\"")
         self.amlg.StoreEntity(
-            handle_buf, file_path_buf, file_type_buf, persist, json_file_params_buf)
+            handle_buf, file_path_buf, file_type_buf, persist, json_file_params_buf, entity_path_p, entity_path_len)
         self._log_reply(None)
 
         del handle_buf
         del file_path_buf
         del file_type_buf
         del json_file_params_buf
+        if entity_path_p is not None:
+            for i in range(entity_path_len):
+                entry_buf = entity_path_p[i]
+                del entry_buf
+            del entity_path_p
+        self.gc()
+
+    def store_entity_to_memory(
+        self,
+        handle: str,
+        *,
+        file_type: str,
+        json_file_params: str = "",
+        entity_path: list[str] | None = None,
+    ) -> bytes | None:
+        """
+        Store entity to memory as a bytes object.
+
+        Parameters
+        ----------
+        handle : str
+            The handle of the amalgam entity.
+        file_type : str
+            The type of file to store, typically ``"amlg"`` for plain-text Amalgam or ``"caml"``
+            for binary compressed Amalgam.
+        json_file_params : str, default ""
+            Either empty string or a string of json specifying a set of key-value pairs
+            which are parameters specific to the file type.  See Amalgam documentation
+            for details of allowed parameters.
+        entity_path: list[str], optional
+            If provided and non-empty, store the content from an entity
+            contained within `handle` at this path.
+
+        Returns
+        -------
+        bytes | None
+            The serialized entity contents, or None on an error.
+        """
+        self.amlg.StoreEntityToMemory.argtypes = [
+            c_char_p, POINTER(c_void_p), POINTER(c_size_t), c_char_p, c_bool, c_char_p, POINTER(c_char_p), c_size_t]
+        self.amlg.StoreEntityToMemory.restype = None
+        handle_buf = self.str_to_char_p(handle)
+        data_p = c_void_p(None)
+        data_len = c_size_t(0)
+        file_type_buf = self.str_to_char_p(file_type)
+        json_file_params_buf = self.str_to_char_p(json_file_params)
+        entity_path_p = None
+        entity_path_len = 0
+
+        if entity_path is not None and len(entity_path) > 0:
+            entity_path_len = len(entity_path)
+            entity_path_p = (c_char_p * entity_path_len)()
+            for i, entry in enumerate(entity_path):
+                entity_path_p[i] = self.str_to_char_p(entry)
+
+        self._log_execution_std(b"STORE_ENTITY_TO_MEMORY", handle, file_type,
+                                suffix=f"false {json_lib.dumps(json_file_params)} \"{' '.join(entity_path or [])}\"")
+        self.amlg.StoreEntityToMemory(
+            handle_buf, byref(data_p), byref(data_len), file_type_buf, False, json_file_params_buf, entity_path_p, entity_path_len)
+
+        result = None
+        if data_p.value is not None:
+            result = string_at(data_p.value, data_len.value)
+            self.amlg.DeleteString.argtypes = [c_char_p]
+            self.amlg.DeleteString.restype = None
+            self.amlg.DeleteString(cast(data_p, c_char_p))
+            self._log_reply(b64encode(result).decode())
+        else:
+            self._log_reply(None)
+
+        del handle_buf
+        del file_type_buf
+        del json_file_params_buf
+        if entity_path_p is not None:
+            for i in range(entity_path_len):
+                entry_buf = entity_path_p[i]
+                del entry_buf
+            del entity_path_p
         self.gc()
+        return result
 
     def destroy_entity(
         self,

amalgam/lib/version.json

@@ -1,8 +1,8 @@
 {
   "version": {
-    "amalgam": "67.0.0",
-    "amalgam_sha": "0354a858c0acd93fd1b2ebcee8f0c5efd283e231",
-    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/67.0.0",
+    "amalgam": "68.0.1",
+    "amalgam_sha": "5e8ae8af4eb649d3a7fc7e4cd5d7c3aad0224e8e",
+    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/68.0.1",
     "amalgam_build_date": "",
     "amalgam_display_title": ""
   }

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

@@ -1,3 +1,3 @@
 {
-  "version": "67.0.0"
+  "version": "68.0.1"
 }

{amalgam_lang-24.0.0.dist-info → amalgam_lang-24.1.1.dist-info}/METADATA

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

amalgam_lang-24.1.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
+amalgam/api.py,sha256=YppRLEJMPD8jWBXxWJR9j_3zrIIGMSDtPp50J9QIq5I,53624
+amalgam/lib/version.json,sha256=68MhjcLp69MlPRE_fGpk6R7U1caLQG_eg6cjFx2j27c,250
+amalgam/lib/windows/amd64/amalgam-mt-noavx.dll,sha256=G8-F0aYl17qQBbF0k6jM9dLA-DlIXWIXuhDBIqXdOhE,2779648
+amalgam/lib/windows/amd64/amalgam-mt.dll,sha256=A8frFfpvslKiPBPD1rT3cspbO9DGwyNkeYE-d0CwGd4,2723840
+amalgam/lib/windows/amd64/amalgam-omp.dll,sha256=-FVKcVxp2c9HNYw65sroy-NGmnMHOKeOPMG0NqMQ5VE,2631168
+amalgam/lib/windows/amd64/amalgam-st.dll,sha256=bUkbVzMdhm5yLZdfTWymP3jYYZnTGS7fT2xd-27n_Lw,2630656
+amalgam/lib/windows/amd64/docs/version.json,sha256=KQWIhNvYHyg7CBaxXHazU_bC9q-Mz-33HJpToeTa3Lo,27
+amalgam_lang-24.1.1.dist-info/licenses/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+amalgam_lang-24.1.1.dist-info/METADATA,sha256=xqgc9BvxX1mVIJpJlrDDKB190BOH95_LbpG6G__6R3g,43832
+amalgam_lang-24.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+amalgam_lang-24.1.1.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
+amalgam_lang-24.1.1.dist-info/RECORD,,

amalgam_lang-24.0.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
-amalgam/api.py,sha256=ij3-PEP0iU-XdBMbyB-3f3h-mWH_y0P-B29BZRSkvK8,44966
-amalgam/lib/version.json,sha256=iU4ZxFSygvwVychE6S9Yb37gQ2YqCjghZGR-vdziFMs,250
-amalgam/lib/windows/amd64/amalgam-mt-noavx.dll,sha256=YPWzRgKuRVVFFXGgfufXPJpoKaxiSiIdippW3eSfiVI,2758144
-amalgam/lib/windows/amd64/amalgam-mt.dll,sha256=JYM7hir1pzJvoQBZ92duxcOe3NcIUO7XRvr8Ty2D5k0,2702336
-amalgam/lib/windows/amd64/amalgam-omp.dll,sha256=1z4pB5M67MHtcSXQuJd6jh676KklvwUxrLFazwsncok,2612736
-amalgam/lib/windows/amd64/amalgam-st.dll,sha256=Vu-jWLxTxCYvQVoUCwvV9MR1b6P5UGm-PxcaCUL2KVI,2612224
-amalgam/lib/windows/amd64/docs/version.json,sha256=b1um7NNSXRf7n8jBQyRstBeydDaUReyj3r-Q6TXrMVo,27
-amalgam_lang-24.0.0.dist-info/licenses/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-amalgam_lang-24.0.0.dist-info/METADATA,sha256=o2E7QW-wRmGMlsh5J5cOkxFP55-0WVAqgnQ0LZgp--g,43832
-amalgam_lang-24.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amalgam_lang-24.0.0.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
-amalgam_lang-24.0.0.dist-info/RECORD,,