Align wtih new idgen_random predicate

Author: hoijnet

terminusdb_client/tests/test_woqlQuery.py

@@ -15,7 +15,7 @@
 from .woqljson.woqlConcatJson import WOQL_CONCAT_JSON
 from .woqljson.woqlIdgenJson import (
     WOQL_IDGEN_JSON,
-    WOQL_RANDOM_IDGEN_JSON,
+    WOQL_RANDOM_KEY_JSON,
     WOQL_UNIQUE_JSON,
 )
 from .woqljson.woqlJoinSplitJson import WOQL_JOIN_SPLIT_JSON
@@ -214,11 +214,9 @@ def test_idgen_method(self):
         woql_object = WOQLQuery().idgen("Station", "v:Start_ID", "v:Start_Station_URL")
         assert woql_object.to_dict() == WOQL_IDGEN_JSON
 
-    def test_random_idgen_method(self):
-        woql_object = WOQLQuery().random_idgen(
-            "Station", "v:Start_ID", "v:Start_Station_URL"
-        )
-        assert woql_object.to_dict() == WOQL_RANDOM_IDGEN_JSON
+    def test_idgen_random_method(self):
+        woql_object = WOQLQuery().idgen_random("Person/", "v:Person_ID")
+        assert woql_object.to_dict() == WOQL_RANDOM_KEY_JSON
 
     def test_typecast_method(self):
         woql_object = WOQLQuery().typecast(

terminusdb_client/tests/woqljson/woqlIdgenJson.py

@@ -27,18 +27,14 @@
     },
 }
 
-WOQL_RANDOM_IDGEN_JSON = {
+WOQL_RANDOM_KEY_JSON = {
     "@type": "RandomKey",
     "base": {
         "@type": "DataValue",
-        "data": {"@type": "xsd:string", "@value": "Station"},
-    },
-    "key_list": {
-        "@type": "DataValue",
-        "variable": "Start_ID",
+        "data": {"@type": "xsd:string", "@value": "Person/"},
     },
     "uri": {
         "@type": "NodeValue",
-        "variable": "Start_Station_URL",
+        "variable": "Person_ID",
     },
 }

terminusdb_client/woqlquery/woql_query.py

@@ -2207,35 +2207,36 @@ def idgen(self, prefix, input_var_list, output_var):
         self._cursor["uri"] = self._clean_node_value(output_var)
         return self
 
-    def random_idgen(self, prefix, key_list, uri):
-        """Randomly generates an ID and appends to the end of the key_list.
+    def idgen_random(self, prefix, uri):
+        """Generates a unique ID with cryptographically secure random suffix.
+
+        Uses base64 encoding to generate 16-character random IDs that are
+        guaranteed to be unique across executions. Matches the server's
+        idgen_random/2 predicate and maintains consistency with the JavaScript client.
 
         Parameters
         ----------
         prefix : str
-            prefix for the id
-        key_list : str
-            variable to generate id for
+            A prefix for the IDs to be generated (e.g. "Person/")
         uri : str
-            the variable to hold the id
+            Variable name or output target for the generated ID
 
         Returns
         -------
         WOQLQuery object
-            query object that can be chained and/or execute
+            query object that can be chained and/or executed
 
         Examples
         -------
-        >>> WOQLQuery().random_idgen("https://base.url",["page","1"],"v:obj_id").execute(client)
-        {'@type': 'api:WoqlResponse', 'api:status': 'api:success', 'api:variable_names': ['obj_id'], 'bindings': [{'obj_id': 'http://base.url_page_1_rv1mfa59ekisdutnxx6zdt2fkockgah'}], 'deletes': 0, 'inserts': 0, 'transaction_retry_count': 0}
+        >>> WOQLQuery().idgen_random("Person/", "v:person_id").execute(client)
+        {'@type': 'api:WoqlResponse', 'api:status': 'api:success', 'api:variable_names': ['person_id'], 'bindings': [{'person_id': 'Person/aB3dEf9GhI2jK4lM'}], 'deletes': 0, 'inserts': 0, 'transaction_retry_count': 0}
         """
         if prefix and prefix == "args":
-            return ["base", "key_list", "uri"]
+            return ["base", "uri"]
         if self._cursor.get("@type"):
             self._wrap_cursor_with_and()
         self._cursor["@type"] = "RandomKey"
         self._cursor["base"] = self._clean_data_value(prefix)
-        self._cursor["key_list"] = self._data_list(key_list)
         self._cursor["uri"] = self._clean_node_value(uri)
         return self