amalgam-lang 7.1.0__py3-none-win_amd64.whl → 7.2.1__py3-none-win_amd64.whl

amalgam/api.py

@@ -596,7 +596,10 @@ class Amalgam:
         handle_buf = self.str_to_char_p(handle)
         label_buf = self.str_to_char_p(label)
 
-        self._log_execution(f"GET_JSON_FROM_LABEL \"{handle}\" \"{label}\"")
+        self._log_execution((
+            f"GET_JSON_FROM_LABEL \"{self.escape_double_quotes(handle)}\" "
+            f"\"{self.escape_double_quotes(label)}\""
+        ))
         result = self.char_p_to_bytes(self.amlg.GetJSONPtrFromLabel(handle_buf, label_buf))
         self._log_reply(result)
 
@@ -630,7 +633,11 @@ class Amalgam:
         label_buf = self.str_to_char_p(label)
         json_buf = self.str_to_char_p(json)
 
-        self._log_execution(f"SET_JSON_TO_LABEL \"{handle}\" \"{label}\" {json}")
+        self._log_execution((
+            f"SET_JSON_TO_LABEL \"{self.escape_double_quotes(handle)}\" "
+            f"\"{self.escape_double_quotes(label)}\" "
+            f"{json}"
+        ))
         self.amlg.SetJSONToLabel(handle_buf, label_buf, json_buf)
         self._log_reply(None)
 
@@ -657,10 +664,10 @@ class Amalgam:
             The handle to assign the entity.
         amlg_path : str
             The path to the filename.amlg/caml file.
-        persist : bool
+        persist : bool, default False
             If set to true, all transactions will trigger the entity to be
             saved over the original source.
-        load_contained : bool
+        load_contained : bool, default False
             If set to true, contained entities will be loaded.
         write_log : str, default ""
             Path to the write log. If empty string, the write log is
@@ -683,7 +690,8 @@ class Amalgam:
         print_log_buf = self.str_to_char_p(print_log)
 
         load_command_log_entry = (
-            f"LOAD_ENTITY \"{handle}\" \"{amlg_path}\" {str(persist).lower()} "
+            f"LOAD_ENTITY \"{self.escape_double_quotes(handle)}\" "
+            f"\"{self.escape_double_quotes(amlg_path)}\" {str(persist).lower()} "
             f"{str(load_contained).lower()} \"{write_log}\" \"{print_log}\""
         )
         self._log_execution(load_command_log_entry)
@@ -721,7 +729,7 @@ class Amalgam:
         self.amlg.VerifyEntity.restype = _LoadEntityStatus
         amlg_path_buf = self.str_to_char_p(amlg_path)
 
-        self._log_execution(f"VERIFY_ENTITY \"{amlg_path}\"")
+        self._log_execution(f"VERIFY_ENTITY \"{self.escape_double_quotes(amlg_path)}\"")
         result = LoadEntityStatus(self, self.amlg.VerifyEntity(amlg_path_buf))
         self._log_reply(result)
 
@@ -729,6 +737,71 @@ class Amalgam:
         self.gc()
 
         return result
+    
+    def clone_entity(
+        self,
+        handle: str,
+        clone_handle: str,
+        amlg_path: str = "",
+        persist: bool = False,
+        write_log: str = "",
+        print_log: str = ""
+    ) -> bool:
+        """
+        Clones entity specified by handle into a new entity specified by clone_handle.
+
+        Parameters
+        ----------
+        handle : str
+            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.
+        persist : bool, default False
+            If set to true, all transactions will trigger the entity to be
+            saved over the original source.
+        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.
+
+        Returns
+        -------
+        bool
+            True if cloned successfully, False if not.
+        """
+        self.amlg.CloneEntity.argtype = [
+            c_char_p, c_char_p, c_char_p, c_bool, 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)
+        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}"'
+        )
+        self._log_execution(clone_command_log_entry)
+        result = self.amlg.LoadEntity(
+            handle_buf, amlg_path_buf, persist,
+            write_log_buf, print_log_buf)
+        self._log_reply(result)
+
+        del handle_buf
+        del clone_handle_buf
+        del amlg_path_buf
+        del write_log_buf
+        del print_log_buf
+        self.gc()
+
+        return result
+        
 
     def store_entity(
         self,
@@ -757,7 +830,9 @@ class Amalgam:
         amlg_path_buf = self.str_to_char_p(amlg_path)
 
         store_command_log_entry = (
-            f"STORE_ENTITY \"{handle}\" \"{amlg_path}\" {str(update_persistence_location).lower()} "
+            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()}"
         )
         self._log_execution(store_command_log_entry)
@@ -784,13 +859,49 @@ class Amalgam:
         self.amlg.DestroyEntity.argtype = [c_char_p]
         handle_buf = self.str_to_char_p(handle)
 
-        self._log_execution(f"DESTROY_ENTITY \"{handle}\"")
+        self._log_execution(f"DESTROY_ENTITY \"{self.escape_double_quotes(handle)}\"")
         self.amlg.DestroyEntity(handle_buf)
         self._log_reply(None)
 
         del handle_buf
         self.gc()
 
+    def set_random_seed(
+        self,
+        handle: str,
+        rand_seed: str
+    ) -> bool:
+        """
+        Sets an entity's random seed.
+
+        Parameters
+        ----------
+        handle : str
+            The handle of the amalgam entity.
+        rand_seed : str
+            A string representing the random seed to set.
+
+        Returns
+        -------
+        bool
+            True if the set was successful, false if not.
+        """
+        self.amlg.SetRandomSeed.argtype = [c_char_p, c_char_p]
+        self.amlg.SetRandomSeed.restype = c_bool
+
+        handle_buf = self.str_to_char_p(handle)
+        rand_seed_buf = self.str_to_char_p(rand_seed)
+
+        self._log_execution(f'SET_RANDOM_SEED "{self.escape_double_quotes(handle)}"'
+                            f'"{self.escape_double_quotes(rand_seed)}"')
+        result = self.amlg.SetRandomSeed(handle_buf, rand_seed)
+        self._log_reply(None)
+
+        del handle_buf
+        del rand_seed_buf
+        self.gc()
+        return result
+
     def get_entities(self) -> List[str]:
         """
         Get loaded top level entities.
@@ -843,7 +954,12 @@ class Amalgam:
         json_buf = self.str_to_char_p(json)
 
         self._log_time("EXECUTION START")
-        self._log_execution(f"EXECUTE_ENTITY_JSON \"{handle}\" \"{label}\" {json}")
+        self._log_execution((
+            "EXECUTE_ENTITY_JSON "
+            f"\"{self.escape_double_quotes(handle)}\" "
+            f"\"{self.escape_double_quotes(label)}\" "
+            f"{json}"
+        ))
         result = self.char_p_to_bytes(self.amlg.ExecuteEntityJsonPtr(
             handle_buf, label_buf, json_buf))
         self._log_time("EXECUTION STOP")
@@ -1079,3 +1195,20 @@ class Amalgam:
             f"call to amlg.GetConcurrencyTypeString() - returned: "
             f"{amlg_concurrency_type}\n")
         return amlg_concurrency_type
+
+    @staticmethod
+    def escape_double_quotes(s: str) -> str:
+        """
+        Get the string with backslashes preceeding contained double quotes.
+
+        Parameters
+        ----------
+        s : str
+            The input string.
+
+        Returns
+        -------
+        str
+            The modified version of s with escaped double quotes.
+        """
+        return s.replace('"', '\\"')

amalgam/lib/version.json

@@ -1,8 +1,8 @@
 {
   "version": {
-    "amalgam": "48.1.1",
-    "amalgam_sha": "415ea412bb3e665a638f0bdc1d86855f88f786dc",
-    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/48.1.1",
+    "amalgam": "48.2.0",
+    "amalgam_sha": "fc26b24b0954ea87d8c4fde8ca0b58a17663c1ef",
+    "amalgam_url": "https://github.com/howsoai/amalgam/releases/tag/48.2.0",
     "amalgam_build_date": "",
     "amalgam_display_title": ""
   }

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

@@ -1,3 +1,3 @@
 {
-  "version": "48.1.1"
+  "version": "48.2.0"
 }

{amalgam_lang-7.1.0.dist-info → amalgam_lang-7.2.1.dist-info}/METADATA

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

amalgam_lang-7.2.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
+amalgam/api.py,sha256=10BFeXShtVxzacxfjBUoZzJBYS0vMf5qlle3jN4DD3M,40396
+amalgam/lib/version.json,sha256=W8_nxG0KMVlaoO6ghUkU5iWbxNlJlGPv5s550on0tmg,250
+amalgam/lib/windows/amd64/amalgam-mt-noavx.dll,sha256=cyxqMgYPnKHd3UmPbnFEwkqKBF5RZKUhKEA3CuHtSOY,2562560
+amalgam/lib/windows/amd64/amalgam-mt.dll,sha256=1YlhbJjXMdcyEH2LnMmhL-5eVV8l_hSsXg2pryxFBKs,2504192
+amalgam/lib/windows/amd64/amalgam-omp.dll,sha256=3ydyO1QyYa2RHZyj6JSuQCzpTisDFSPdYX4UYW_Jk0Q,2417664
+amalgam/lib/windows/amd64/amalgam-st.dll,sha256=OGqXNDe8HIEK7cuyl7ENcyOS4EooeDNBNV1apqXhSEc,2416640
+amalgam/lib/windows/amd64/docs/version.json,sha256=Sv3ShUvvQE-bPVCuBZ__2ryg4zcmJ7EIef2OgSQ5tdc,27
+amalgam_lang-7.2.1.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+amalgam_lang-7.2.1.dist-info/METADATA,sha256=AGkhBcdFxn2Fr9vT6IuXrJp-Zx0ow6OwLIU5Mu3ygmY,43351
+amalgam_lang-7.2.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+amalgam_lang-7.2.1.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
+amalgam_lang-7.2.1.dist-info/RECORD,,

amalgam_lang-7.1.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-amalgam/__init__.py,sha256=oHu7Zr4eGDUqj93pLwz8t7gLa8lpAx6Q-xbGiJ3nJx0,18
-amalgam/api.py,sha256=8DnZnEa9_qYg-zCz6_myus516bgpTwZHMhG5BFiyuBA,36170
-amalgam/lib/version.json,sha256=vu5Je_Y8yHf8nGVI8YKMRsBHG-baoo1tN-UMtnqKbI4,250
-amalgam/lib/windows/amd64/amalgam-mt-noavx.dll,sha256=rm7kxrlYYIh1K3F5tNqR3sfoFncv1dP5LnYRlTXJIDM,2563072
-amalgam/lib/windows/amd64/amalgam-mt.dll,sha256=oPMYFgZm2beCUv90ZAZj32TSJMbGjBHAApik59rI_A8,2504192
-amalgam/lib/windows/amd64/amalgam-omp.dll,sha256=nSwwfqlptwlGVwJwcKPFXU8BaFt5QNEEmRtGNR5ssFw,2418176
-amalgam/lib/windows/amd64/amalgam-st.dll,sha256=PUWg-lVEg3r0veUN32XNhGCRAEiXpCvSj3Ftyaaxi0w,2417152
-amalgam/lib/windows/amd64/docs/version.json,sha256=QHcXBkWxCce9TII-j2vzkJqmGnqGsLWJ6IPhwb_Zkf0,27
-amalgam_lang-7.1.0.dist-info/LICENSE.txt,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-amalgam_lang-7.1.0.dist-info/METADATA,sha256=Sgdgv3y9YuVxZrV3cpK_MIeNZuv14NNuXzGf_ni7w6o,43351
-amalgam_lang-7.1.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-amalgam_lang-7.1.0.dist-info/top_level.txt,sha256=rmPHU144SyaB25u5-FAQyECAQnJ39NvuJEcKXMRcdBo,8
-amalgam_lang-7.1.0.dist-info/RECORD,,