Rename dialogId and dialogIdParent to id and parentId for consistency across Dialog class and related modules

Author: sergioburdisso

src/sdialog/__init__.py

@@ -106,8 +106,8 @@ class Dialog(BaseModel):
     formatVersion: Optional[str] = Field(default_factory=_get_dynamic_version)  # Version of the format
     model: Optional[str] = None  # the model used to generate the dialogue
     seed: Optional[int] = None  # the seed used to generated
-    dialogId: Optional[int] = None  # Unique ID for the dialogue
-    dialogIdParent: Optional[int] = None  # ID of the parent dialogue, if any
+    id: Optional[int] = None  # Unique ID for the dialogue
+    parentId: Optional[int] = None  # ID of the parent dialogue, if any
     complete: Optional[bool] = None
     personas: Optional[dict[str, dict[str, Any]]] = None  # personas used in the dialogue
     scenario: Optional[Union[dict, str]] = None  # the scenario used to generated the dialogue
@@ -286,8 +286,8 @@ def _print_dialog(dialog: Union[Dialog, dict], scenario: bool = False, orchestra
     speaker_utt_colors = ["grey", "white"]
     # speaker_utt_colors = ["black", "grey"]
 
-    if dialog.dialogId:
-        print(dialog.dialogId, tag="dialog_id", tag_color="purple", color="magenta", format="bold")
+    if dialog.id:
+        print(dialog.id, tag="dialog_id", tag_color="purple", color="magenta", format="bold")
     if dialog.complete:
         print(dialog.complete, tag="complete", tag_color="purple", color="magenta", format="bold")
     if dialog.model:

src/sdialog/datasets.py

@@ -95,7 +95,7 @@ def get_dialog(id):
                 e["Agent"] = "System"
 
         return Dialog(
-            dialogId=id,
+            id=id,
             scenario=dialog["Scenario"],
             turns=[Turn(speaker=e["Agent"], text=e["Text"])
                    for e in dialog["Events"]

src/sdialog/generators.py

@@ -123,8 +123,8 @@ def generate(self, seed: int = None, id: int = None, parent_id: int = None, note
             llm_output = self.output_format.model_validate(json.loads(dialogue))
 
             if self.output_format is LLMDialogOutput:
-                return Dialog(dialogId=id if id else None,
-                              dialogIdParent=parent_id,
+                return Dialog(id=id if id else None,
+                              parentId=parent_id,
                               model=self.model_name,
                               seed=self.llm.seed,
                               personas=self._personas,

src/sdialog/personas.py

@@ -646,8 +646,8 @@ def dialog_with(self,
             }
 
         return Dialog(
-            dialogId=id if id else None,
-            dialogIdParent=parent_id,
+            id=id if id else None,
+            parentId=parent_id,
             complete=completion,  # incomplete if ran out of iterations (reached max_iteration number)
             model=self.model_name,
             seed=seed,