chore: update function signatures in note.py to ensure 'file' is the first parameter; adjust test cases for consistency

Author: Bucknalla

notecard/note.py

@@ -63,7 +63,7 @@ def add(card, binary=None, body=None, file=None, full=None, key=None, limit=None
 
 
 @validate_card_object
-def changes(card, delete=None, deleted=None, file, max=None, reset=None, start=None, stop=None, tracker=None):
+def changes(card, file, delete=None, deleted=None, max=None, reset=None, start=None, stop=None, tracker=None):
     """Use to incrementally retrieve changes within a specific Notefile.
 
     Args:
@@ -153,7 +153,7 @@ def get(card, decrypt=None, delete=None, deleted=None, file=None, note=None):
 
 
 @validate_card_object
-def template(card, body=None, delete=None, file, format=None, length=None, port=None, verify=None):
+def template(card, file, body=None, delete=None, format=None, length=None, port=None, verify=None):
     """By using the `note.template` request with any `.qo`/`.qos` Notefile, developers can provide the Notecard with a schema of sorts to apply to future Notes added to the Notefile. This template acts as a hint to the Notecard that allows it to internally store data as fixed-length binary records rather than as flexible JSON objects which require much more memory. Using templated Notes in place of regular Notes increases the storage and sync capability of the Notecard by an order of magnitude. Read about Working with Note Templates for additional information.
 
     Args:
@@ -188,7 +188,7 @@ def template(card, body=None, delete=None, file, format=None, length=None, port=
 
 
 @validate_card_object
-def update(card, body=None, file, note, payload=None, verify=None):
+def update(card, file, note, body=None, payload=None, verify=None):
     """Update a Note in a DB Notefile by its ID, replacing the existing `body` and/or `payload`.
 
     Args:

scripts/generate_apis.py

@@ -199,6 +199,10 @@ def generate_function_signature(self, api: Dict[str, Any]) -> str:
         properties = api["properties"]
         required = api["required"]
 
+        # Separate required and optional parameters
+        required_params = []
+        optional_params = []
+
         # Add parameters for schema properties
         for prop_name, _ in properties.items():
             if prop_name in ["req", "cmd"]:  # Skip these as they're auto-generated
@@ -209,11 +213,15 @@ def generate_function_signature(self, api: Dict[str, Any]) -> str:
             if param_name in self.reserved_keywords:
                 param_name = f"{param_name}_"
 
-            # Required parameters come first without default values
+            # Separate required and optional parameters
             if prop_name in required and prop_name not in ["req", "cmd"]:
-                params.append(f"{param_name}")
+                required_params.append(f"{param_name}")
             else:
-                params.append(f"{param_name}=None")
+                optional_params.append(f"{param_name}=None")
+
+        # Add required parameters first, then optional parameters
+        params.extend(required_params)
+        params.extend(optional_params)
 
 
         return f"def {func_name}({', '.join(params)}):"

test/fluent_api/test_note.py

@@ -10,7 +10,7 @@
             'note.add',
             {
                 'file': 'data.qo',
-                'body': {'key_a:', 'val_a', 'key_b', 42},
+                'body': {'key_a': 'val_a', 'key_b': 42},
                 'payload': 'ewogICJpbnRlcnZhbHMiOiI2MCwxMiwxNCIKfQ==',
                 'sync': True
             },
@@ -90,7 +90,7 @@
             'note.template',
             {
                 'file': 'my-settings.db',
-                'body': {'key_a:', 'val_a', 'key_b', 42},
+                'body': {'key_a': 'val_a', 'key_b': 42},
                 'length': 42,
                 'format': "compact"
             },
@@ -111,7 +111,7 @@
             {
                 'file': 'my-settings.db',
                 'note': 'my_note',
-                'body': {'key_a:', 'val_a', 'key_b', 42},
+                'body': {'key_a': 'val_a', 'key_b': 42},
                 'payload': 'ewogICJpbnRlcnZhbHMiOiI2MCwxMiwxNCIKfQ=='
             },
         ),