The return of 'add_data' and 'add_batch' is more clear.

Author: RobinEnjalbert

docs/src/Core/Storage/database.rst

@@ -117,7 +117,7 @@ Adding data to a Table
 ----------------------
 
 Adding data to a *Table* can be done either line by line either per batch of lines.
-In both cases, data must be passed as a dictionary:
+In both cases, data must be passed as a dictionary and the index of the created line(s) are returned:
 
 .. code-block:: python
 

docs/src/Core/Storage/relationships.rst

@@ -44,12 +44,12 @@ Data can still be added either line by line either per batch of lines:
     new_array = np.random.uniform(size=(10,))
 
     # Add a single line to Tables independently
-    stats = db.add_data(table_name='Stats',
-                        data={'mean': new_array.mean(),
-                              'max':  new_array.max()})
+    id_stats_line = db.add_data(table_name='Stats',
+                                data={'mean': new_array.mean(),
+                                      'max':  new_array.max()})
     db.add_data(table_name='Arrays',
                 data={'array': new_array,
-                      'stats': stats})
+                      'stats': id_stats_line})
 
     # Add a single line to Tables using the main Table
     db.add_data(table_name='Arrays',
@@ -62,12 +62,12 @@ Data can still be added either line by line either per batch of lines:
     new_arrays = [np.random.uniform(size=(10,)) for _ in range(5)]
 
     # Add a batch to Tables independently
-    stats = [db.add_data(table_name='Stats',
-                         data={'mean': new_array.mean(),
-                               'max':  new_array.max()}) for new_array in new_arrays]
+    id_stats_lines = db.add_batch(table_name='Stats',
+                                  data={'mean': [new_array.mean() for new_array in new_arrays],
+                                        'max':  [new_array.max() for new_array in new_arrays]})
     db.add_batch(table_name='Arrays',
                  batch={'array': new_arrays,
-                        'stats': stats})
+                        'stats': id_stats_lines})
 
     # Add a batch to Tables using th main Table
     db.add_batch(table_name='Arrays',

src/Core/Storage/AdaptiveTable.py

@@ -149,7 +149,7 @@ def add_data(cls,
                 for chunk in chunked(batch, 100):
                     cls.insert_many(chunk, fields=fields).execute()
             N = cls.select().count()
-            return [cls.get_by_id(i + 1) for i in range(n, N)]
+            return [cls.get_by_id(i + 1).id for i in range(n, N)]
 
 
 class ExchangeTable(AdaptiveTable):
@@ -165,14 +165,17 @@ def add_data(cls,
             cls.delete().execute()
             line = cls(**dict(zip(fields_names, fields_values)))
             line.save()
-            return line
+            return line.id
 
         else:
             fields = [getattr(cls, field) for field in fields_names]
             batch = [tuple(samples) for samples in zip(*fields_values)]
             cls.delete().execute()
             pre_save.send(cls, created=False)
+            n = cls.select().count()
             with cls.database().atomic():
                 for chunk in chunked(batch, 100):
                     cls.insert_many(chunk, fields=fields).execute()
+            N = cls.select().count()
             post_save.send(cls, created=False)
+            return [cls.get_by_id(i + 1).id for i in range(n, N)]

src/Core/Storage/Database.py

@@ -337,7 +337,7 @@ def add_data(self,
                  table_name: str,
                  data: Dict[str, Any]):
         """
-        Execute a line insert query.
+        Execute a line insert query. Return the index of the new line in the Table.
 
         :param table_name: Name of the Table.
         :param data: New line of the Table.
@@ -351,7 +351,7 @@ def add_batch(self,
                   table_name: str,
                   batch: Dict[str, List[Any]]):
         """
-        Execute a batch insert query.
+        Execute a batch insert query. Return the indices of the new lines in the Table.
 
         :param table_name: Name of the Table.
         :param batch: New lines of the Table.
@@ -364,9 +364,9 @@ def add_batch(self,
             if len(unique(samples := [len(b) for b in batch_values])) != 1:
                 raise ValueError(f"The number of samples per batch must be the same for all fields. Number of samples "
                                  f"received per field: {dict(zip(batch.keys(), samples))}")
-        self.__add_data(table_name=table_name,
-                        data=batch,
-                        batched=True)
+        return self.__add_data(table_name=table_name,
+                               data=batch,
+                               batched=True)
 
     def __add_data(self,
                    table_name: str,