amalgam-lang 12.4.4__py3-none-manylinux_2_29_aarch64.whl → 13.0.1__py3-none-manylinux_2_29_aarch64.whl

amalgam/api.py

@@ -6,6 +6,7 @@ from ctypes import (
 )
 from datetime import datetime
 import gc
+import json as json_lib
 import logging
 from pathlib import Path
 import platform
@@ -698,12 +699,11 @@ class Amalgam:
     def load_entity(
         self,
         handle: str,
-        amlg_path: str,
+        file_path: str,
         *,
+        file_type: str = "",
         persist: bool = False,
-        load_contained: bool = False,
-        escape_filename: bool = False,
-        escape_contained_filenames: bool = True,
+        json_file_params: str = "",
         write_log: str = "",
         print_log: str = ""
     ) -> LoadEntityStatus:
@@ -714,18 +714,17 @@ class Amalgam:
         ----------
         handle : str
             The handle to assign the entity.
-        amlg_path : str
-            The path to the filename.amlg/caml file.
+        file_path : str
+            The path of the file name to load.
+        file_type : str, default ""
+            If set to a nonempty string, will represent the type of file to load.
         persist : bool, default False
-            If set to true, all transactions will trigger the entity to be
-            saved over the original source.
-        load_contained : bool, default False
-            If set to true, contained entities will be loaded.
-        escape_filename : bool, default False
-            If set to true, the filename will be aggressively escaped.
-        escape_contained_filenames : bool, default True
-            If set to true, the filenames of contained entities will be
-            aggressively escaped.
+            If set to true, all transactions that update the entity will also be
+            written to the files.
+        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.
@@ -739,29 +738,32 @@ class Amalgam:
             Status of LoadEntity call.
         """
         self.amlg.LoadEntity.argtypes = [
-            c_char_p, c_char_p, c_bool, c_bool, c_bool, c_bool, 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]
         self.amlg.LoadEntity.restype = _LoadEntityStatus
         handle_buf = self.str_to_char_p(handle)
-        amlg_path_buf = self.str_to_char_p(amlg_path)
+        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)
         write_log_buf = self.str_to_char_p(write_log)
         print_log_buf = self.str_to_char_p(print_log)
 
         load_command_log_entry = (
             f"LOAD_ENTITY \"{self.escape_double_quotes(handle)}\" "
-            f"\"{self.escape_double_quotes(amlg_path)}\" {str(persist).lower()} "
-            f"{str(load_contained).lower()} {str(escape_filename).lower()} "
-            f"{str(escape_contained_filenames).lower()} \"{write_log}\" "
-            f"\"{print_log}\""
+            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}\""
         )
         self._log_execution(load_command_log_entry)
         result = LoadEntityStatus(self, self.amlg.LoadEntity(
-            handle_buf, amlg_path_buf, persist, load_contained,
-            escape_filename, escape_contained_filenames,
-            write_log_buf, print_log_buf))
+            handle_buf, file_path_buf, file_type_buf, persist,
+            json_file_params_buf, write_log_buf, print_log_buf))
         self._log_reply(result)
 
         del handle_buf
-        del amlg_path_buf
+        del file_path_buf
+        del file_type_buf
+        del json_file_params_buf
         del write_log_buf
         del print_log_buf
         self.gc()
@@ -770,14 +772,14 @@ class Amalgam:
 
     def verify_entity(
         self,
-        amlg_path: str
+        file_path: str
     ) -> LoadEntityStatus:
         """
         Verify an entity from an amalgam source file.
 
         Parameters
         ----------
-        amlg_path : str
+        file_path : str
             The path to the filename.amlg/caml file.
 
         Returns
@@ -787,13 +789,13 @@ class Amalgam:
         """
         self.amlg.VerifyEntity.argtypes = [c_char_p]
         self.amlg.VerifyEntity.restype = _LoadEntityStatus
-        amlg_path_buf = self.str_to_char_p(amlg_path)
+        file_path_buf = self.str_to_char_p(file_path)
 
-        self._log_execution(f"VERIFY_ENTITY \"{self.escape_double_quotes(amlg_path)}\"")
-        result = LoadEntityStatus(self, self.amlg.VerifyEntity(amlg_path_buf))
+        self._log_execution(f"VERIFY_ENTITY \"{self.escape_double_quotes(file_path)}\"")
+        result = LoadEntityStatus(self, self.amlg.VerifyEntity(file_path_buf))
         self._log_reply(result)
 
-        del amlg_path_buf
+        del file_path_buf
         self.gc()
 
         return result
@@ -803,8 +805,10 @@ class Amalgam:
         handle: str,
         clone_handle: str,
         *,
-        amlg_path: str = "",
+        file_path: str = "",
+        file_type: str = "",
         persist: bool = False,
+        json_file_params: str = "",
         write_log: str = "",
         print_log: str = ""
     ) -> bool:
@@ -817,11 +821,17 @@ class Amalgam:
             The handle of the amalgam entity to clone.
         clone_handle : str
             The handle to clone the entity into.
-        amlg_path : str, default ""
-            The path to store the filename.amlg/caml file.  Only relevant if persist is True.
+        file_path : str, default ""
+            The path of the file name to load.
+        file_type : str, default ""
+            If set to a nonempty string, will represent the type of file to load.
         persist : bool, default False
-            If set to true, all transactions will trigger the entity to be
-            saved over the original source.
+            If set to true, all transactions that update the entity will also be
+            written to the files.
+        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.
@@ -835,28 +845,34 @@ class Amalgam:
             True if cloned successfully, False if not.
         """
         self.amlg.CloneEntity.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]
         handle_buf = self.str_to_char_p(handle)
         clone_handle_buf = self.str_to_char_p(clone_handle)
-        amlg_path_buf = self.str_to_char_p(amlg_path)
+        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)
         write_log_buf = self.str_to_char_p(write_log)
         print_log_buf = self.str_to_char_p(print_log)
 
         clone_command_log_entry = (
             f'CLONE_ENTITY "{self.escape_double_quotes(handle)}" '
             f'"{self.escape_double_quotes(clone_handle)}" '
-            f'"{self.escape_double_quotes(amlg_path)}" {str(persist).lower()} '
-            f'"{write_log}" "{print_log}"'
+            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}\""
         )
         self._log_execution(clone_command_log_entry)
         result = self.amlg.CloneEntity(
-            handle_buf, clone_handle_buf, amlg_path_buf, persist,
-            write_log_buf, print_log_buf)
+            handle_buf, clone_handle_buf, file_path_buf, file_type_buf, persist,
+            json_file_params_buf, write_log_buf, print_log_buf)
         self._log_reply(result)
 
         del handle_buf
         del clone_handle_buf
-        del amlg_path_buf
+        del file_path_buf
+        del file_type_buf
+        del json_file_params_buf
         del write_log_buf
         del print_log_buf
         self.gc()
@@ -866,43 +882,53 @@ class Amalgam:
     def store_entity(
         self,
         handle: str,
-        amlg_path: str,
+        file_path: str,
         *,
-        update_persistence_location: bool = False,
-        store_contained: bool = False
+        file_type: str = "",
+        persist: bool = False,
+        json_file_params: str = "",
     ):
         """
-        Store entity to the file type specified within amlg_path.
+        Store entity to the file type specified within file_path.
 
         Parameters
         ----------
         handle : str
             The handle of the amalgam entity.
-        amlg_path : str
-            The path to the filename.amlg/caml file.
-        update_persistence_location : bool
-            If set to true, updates location entity is persisted to.
-        store_contained : bool
-            If set to true, contained entities will be stored.
+        file_path : str
+            The path of the file name to load.
+        file_type : str, default ""
+            If set to a nonempty string, will represent the type of file to load.
+        persist : bool, default False
+            If set to true, all transactions that update the entity will also be
+            written to the files.
+        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.
         """
         self.amlg.StoreEntity.argtypes = [
-            c_char_p, c_char_p, c_bool, c_bool]
+            c_char_p, c_char_p, c_char_p, c_bool, c_char_p]
         handle_buf = self.str_to_char_p(handle)
-        amlg_path_buf = self.str_to_char_p(amlg_path)
+        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)
 
         store_command_log_entry = (
             f"STORE_ENTITY \"{self.escape_double_quotes(handle)}\" "
-            f"\"{self.escape_double_quotes(amlg_path)}\" "
-            f"{str(update_persistence_location).lower()} "
-            f"{str(store_contained).lower()}"
+            f"\"{self.escape_double_quotes(file_path)}\" "
+            f"\"{self.escape_double_quotes(file_type)}\" {str(persist).lower()} "
+            f"{json_lib.dumps(json_file_params)} "
         )
         self._log_execution(store_command_log_entry)
         self.amlg.StoreEntity(
-            handle_buf, amlg_path_buf, update_persistence_location, store_contained)
+            handle_buf, file_path_buf, file_type_buf, persist, json_file_params_buf)
         self._log_reply(None)
 
         del handle_buf
-        del amlg_path_buf
+        del file_path_buf
+        del file_type_buf
+        del json_file_params_buf
         self.gc()
 
     def destroy_entity(

amalgam/lib/linux/arm64/docs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "54.7.1"
+  "version": "55.1.0"
 }

amalgam/lib/linux/arm64_8a/docs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "54.7.1"
+  "version": "55.1.0"
 }

amalgam/lib/version.json

@@ -1,8 +1,8 @@
 {
   "version": {
-    "amalgam": "54.7.1",
-    "amalgam_sha": "42ebdba9dcfde2c4942ac4a2a21f3c38fbbae950",
-    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/54.7.1",
+    "amalgam": "55.1.0",
+    "amalgam_sha": "e17f52b8baf84757d2e312725fe2f62368fcee53",
+    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/55.1.0",
     "amalgam_build_date": "",
     "amalgam_display_title": ""
   }

{amalgam_lang-12.4.4.dist-info → amalgam_lang-13.0.1.dist-info}/METADATA

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

amalgam_lang-13.0.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
+amalgam/api.py,sha256=32K9fOdTJTiJYHqs3mX2q9dqxkLCA72POQ5Ri958Tzk,38164
+amalgam/lib/version.json,sha256=FaQDg5wx8SQmhHrUeyodj186RQP9cpMc6to4gfSh0Ws,250
+amalgam/lib/linux/arm64/amalgam-mt.so,sha256=CKTzO2RDD_pWP1mTCLS1ZGqdcNeJmnTI6wYCXABKDQ8,3597744
+amalgam/lib/linux/arm64/amalgam-omp.so,sha256=8GL84LW2fzsvqlYvZx64IclLJp8DzpyGo5lr4hMICo4,3453168
+amalgam/lib/linux/arm64/amalgam-st.so,sha256=W4Xo4lzm9lmg17nugrrnDOby2jf4vkujwPYvgVPmffo,3462936
+amalgam/lib/linux/arm64/docs/version.json,sha256=kyZUKu0oBwEegnU7s4FgFSpfKKT-Kc9Yiuc3rQauh-o,25
+amalgam/lib/linux/arm64_8a/amalgam-st.so,sha256=9zGcm1U1Pd39AFmt7yaMg7_auvPbc-Ker62IeYv2JbM,3457080
+amalgam/lib/linux/arm64_8a/docs/version.json,sha256=kyZUKu0oBwEegnU7s4FgFSpfKKT-Kc9Yiuc3rQauh-o,25
+amalgam_lang-13.0.1.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+amalgam_lang-13.0.1.dist-info/METADATA,sha256=4KZ0hKDwdm9xJH-8h4ksWVifGzYMG2uZg-0Tj5FVBfk,43814
+amalgam_lang-13.0.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+amalgam_lang-13.0.1.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
+amalgam_lang-13.0.1.dist-info/RECORD,,

{amalgam_lang-12.4.4.dist-info → amalgam_lang-13.0.1.dist-info}/WHEEL

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

amalgam_lang-12.4.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
-amalgam/api.py,sha256=IWS--0NCnhsadMYSna2gLllNxG_i3HpymY3eXbugwDU,36796
-amalgam/lib/version.json,sha256=YUvyuI1u1VNGsViFkBaVkyjSQCJFGEeS-pjO1bXKgbg,250
-amalgam/lib/linux/arm64/amalgam-mt.so,sha256=c6CNkaFUPUMwbawKV9CEkdj4l87exr7cZ4LEEsNmRIw,3612800
-amalgam/lib/linux/arm64/amalgam-omp.so,sha256=1ojzi1Tu2c5GYox4U0_PNKCqP__-eetDhsxUx_m1Low,3458768
-amalgam/lib/linux/arm64/amalgam-st.so,sha256=DQ_B7A67OWeX9CuDcEHcd5pyaKHfcVEyAGd1NOad94Y,3452008
-amalgam/lib/linux/arm64/docs/version.json,sha256=iFB5iMUd5KXilFjyNpKKAPuGfeR5wj7jYdEeg8AQCWI,25
-amalgam/lib/linux/arm64_8a/amalgam-st.so,sha256=saItbssOhl7iwG-SP9plUHJHBxO8Qb-1GxMAAbZ3Q8g,3458800
-amalgam/lib/linux/arm64_8a/docs/version.json,sha256=iFB5iMUd5KXilFjyNpKKAPuGfeR5wj7jYdEeg8AQCWI,25
-amalgam_lang-12.4.4.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-amalgam_lang-12.4.4.dist-info/METADATA,sha256=Qy0sURSJz_nql2f0xXwsydhHSAHEMdHRs4Kbbos4pQo,43814
-amalgam_lang-12.4.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-amalgam_lang-12.4.4.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
-amalgam_lang-12.4.4.dist-info/RECORD,,