amalgam-lang 7.1.0__tar.gz → 7.2.1__tar.gz

{amalgam-lang-7.1.0 → amalgam-lang-7.2.1}/.github/workflows/build.yml

@@ -278,7 +278,7 @@ jobs:
       config-pretty: 'MT'
       upstream-details: ${{ needs.metadata.outputs.upstream-details }}
 
-  release:
+  publish:
     if: inputs.build-type == 'release'
     needs:
       - metadata
@@ -291,43 +291,39 @@ jobs:
       - pytest-windows-3-11-mt
     runs-on: ubuntu-latest
     environment:
-      name: pypi
+      name: PyPi
     permissions:
-      contents: write
       id-token: write
-
     steps:
 
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: ./tmp
-
-      - name: Clean up dir
-        run: |
-          mkdir -p dist
-          find ./tmp -type f -name '*.whl' -exec mv -t ./dist {} +
-          find ./tmp -type f -name '*.tar.gz' -exec mv -t ./dist {} +
-          ls ./dist
-
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ needs.metadata.outputs.version }}
-          commit: ${{ github.sha }}
-          name: "${{ github.event.repository.name }} ${{ needs.metadata.outputs.version }}"
-          artifactErrorsFailBuild: true
-          generateReleaseNotes: true
-          makeLatest: legacy
-          artifacts: "dist/*"
-          artifactContentType: application/gzip
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+    - name: Download Artifacts
+      uses: actions/download-artifact@v4
+      with:
+        path: ./tmp
+
+    - name: Configure environment
+      run: |
+        mkdir -p dist
+        find ./tmp -type f -name '*.whl' -exec cp -t ./dist {} +
+        find ./tmp -type f -name '*.tar.gz' -exec cp -t ./dist {} +
+        ls ./dist
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.11"
+
+    - name: Publish [PyPi]
+      uses: pypa/gh-action-pypi-publish@release/v1
+
+  release:
+    if: inputs.build-type == 'release'
+    needs:
+      - metadata
+      - publish
+    uses: howsoai/.github/.github/workflows/release.yml@main
+    secrets: inherit
+    with:
+      publish_location: 'PyPi'
+      version: ${{ needs.metadata.outputs.version }}
+      publish_name: 'amalgam-lang'

{amalgam-lang-7.1.0 → amalgam-lang-7.2.1}/PKG-INFO

@@ -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.1.0 → amalgam-lang-7.2.1}/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-lang-7.2.1/amalgam/lib/darwin/amd64/docs/version.json

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

amalgam-lang-7.2.1/amalgam/lib/darwin/arm64/docs/version.json

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

amalgam-lang-7.2.1/amalgam/lib/linux/amd64/docs/version.json

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

amalgam-lang-7.2.1/amalgam/lib/linux/arm64/docs/version.json

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

amalgam-lang-7.2.1/amalgam/lib/linux/arm64_8a/docs/version.json

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

{amalgam-lang-7.1.0 → amalgam-lang-7.2.1}/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-lang-7.2.1/amalgam/lib/windows/amd64/docs/version.json

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

{amalgam-lang-7.1.0 → amalgam-lang-7.2.1}/amalgam_lang.egg-info/PKG-INFO

@@ -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.1.0 → amalgam-lang-7.2.1}/version.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "amalgam": "48.1.1"
+    "amalgam": "48.2.0"
   }
 }

amalgam-lang-7.1.0/amalgam/lib/darwin/amd64/docs/version.json

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

amalgam-lang-7.1.0/amalgam/lib/darwin/arm64/docs/version.json

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

amalgam-lang-7.1.0/amalgam/lib/linux/amd64/docs/version.json

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

amalgam-lang-7.1.0/amalgam/lib/linux/arm64/docs/version.json

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

amalgam-lang-7.1.0/amalgam/lib/linux/arm64_8a/docs/version.json

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

amalgam-lang-7.1.0/amalgam/lib/windows/amd64/docs/version.json

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