GameSentenceMiner 2.16.6__py3-none-any.whl → 2.16.7__py3-none-any.whl

GameSentenceMiner/web/database_api.py

@@ -978,21 +978,24 @@ def register_database_api_routes(app):
                 imported_lines = []
                 games_set = set()
                 errors = []
-                seen_uuids = set()  # Track UUIDs within this import batch
-                
+                seen_uuids = set()  # Track UUIDs + Line within import batch
+
+                def get_line_hash(uuid: str, line_text: str) -> str:
+                    return uuid + '|' + line_text.strip()
+
                 for row_num, row in enumerate(csv_reader):
                     try:
                         # Extract and validate required fields
-                        uuid = row.get('uuid', '').strip()
-                        name = row.get('name', '').strip()
+                        game_uuid = row.get('uuid', '').strip()
+                        game_name = row.get('name', '').strip()
                         line = row.get('line', '').strip()
                         time_str = row.get('time', '').strip()
                         
                         # Validate required fields
-                        if not uuid:
+                        if not game_uuid:
                             errors.append(f"Row {row_num}: Missing UUID")
                             continue
-                        if not name:
+                        if not game_name:
                             errors.append(f"Row {row_num}: Missing name")
                             continue
                         if not line:
@@ -1002,12 +1005,12 @@ def register_database_api_routes(app):
                             errors.append(f"Row {row_num}: Missing time")
                             continue
                         
-                        # Check for duplicates within this import batch
-                        if uuid in seen_uuids:
-                            logger.info(f"Skipping duplicate UUID within import batch: {uuid}")
+                        line_hash = get_line_hash(game_uuid, line)
+                        if line_hash in seen_uuids:
+                            logger.info(f"Skipping duplicate line from game UUID {game_uuid} in import batch")
                             continue
-                        seen_uuids.add(uuid)
-                        
+                        seen_uuids.add(line_hash)
+
                         # Convert time to timestamp
                         try:
                             timestamp = float(time_str)
@@ -1018,22 +1021,22 @@ def register_database_api_routes(app):
                         # Clean up line text (remove extra whitespace and newlines)
                         line_text = line.strip()
                         
-                        # Check if this UUID already exists in database
-                        existing_line = GameLinesTable.get(uuid)
+                        # Check if this line already exists in database
+                        existing_line = GameLinesTable.get(line_hash)
                         if existing_line:
-                            logger.info(f"Skipping duplicate UUID already in database: {uuid}")
+                            logger.info(f"Skipping duplicate UUID already in database: {line_hash}")
                             continue
                         
                         # Create GameLinesTable entry
                         game_line = GameLinesTable(
-                            id=uuid,
-                            game_name=name,
+                            id=line_hash,
+                            game_name=game_name,
                             line_text=line_text,
                             timestamp=timestamp
                         )
                         
                         imported_lines.append(game_line)
-                        games_set.add(name)
+                        games_set.add(game_name)
                         
                     except Exception as e:
                         errors.append(f"Row {row_num}: Error processing row - {str(e)}")

{gamesentenceminer-2.16.6.dist-info → gamesentenceminer-2.16.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.16.6
+Version: 2.16.7
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.16.6.dist-info → gamesentenceminer-2.16.7.dist-info}/RECORD

@@ -56,7 +56,7 @@ GameSentenceMiner/util/downloader/oneocr_dl.py,sha256=l3s9Z-x1b57GX048o5h-MVv0UT
 GameSentenceMiner/util/win10toast/__init__.py,sha256=6TL2w6rzNmpJEp6_v2cAJP_7ExA3UsKzwdM08pNcVfE,5341
 GameSentenceMiner/util/win10toast/__main__.py,sha256=5MYnBcFj8y_6Dyc1kiPd0_FsUuh4yl1cv5wsleU6V4w,668
 GameSentenceMiner/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/web/database_api.py,sha256=Fk51pNWsSXL0tq4YqVF-evAcu9NZ1XX51fb9SLR3CEQ,50782
+GameSentenceMiner/web/database_api.py,sha256=yz06Y3DZGGsfeMQzCOUalTqj-expK_hMr6oZhplOUeM,50937
 GameSentenceMiner/web/events.py,sha256=6Vyz5c9MdpMIa7Zqljqhap2XFQnAVYJ0CdQV64TSZsA,5119
 GameSentenceMiner/web/gsm_websocket.py,sha256=IwwQo6VtgPqeOuc-datgfJyLpX3LwB2MISDqA6EkiSA,4131
 GameSentenceMiner/web/service.py,sha256=YZchmScTn7AX_GkwV1ULEK6qjdOnJcpc3qfMwDf7cUE,5363
@@ -90,9 +90,9 @@ GameSentenceMiner/web/templates/utility.html,sha256=KtqnZUMAYs5XsEdC9Tlsd40NKAVi
 GameSentenceMiner/web/templates/components/navigation.html,sha256=6y9PvM3nh8LY6JWrZb6zVOm0vqkBLDc6d3gB9X5lT_w,1055
 GameSentenceMiner/web/templates/components/theme-styles.html,sha256=hiq3zdJljpRjQO1iUA7gfFKwXebltG-IWW-gnKS4GHA,3439
 GameSentenceMiner/wip/__init___.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamesentenceminer-2.16.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.16.6.dist-info/METADATA,sha256=teMRqganfBhqm1zn_U6Fd5ZbFl6zRt1dFbYq9VxZDWY,7348
-gamesentenceminer-2.16.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.16.6.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.16.6.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.16.6.dist-info/RECORD,,
+gamesentenceminer-2.16.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.16.7.dist-info/METADATA,sha256=YVoiDIvmBYF-EZikzbgl-84q2Q2hD-GZeCvBMvb4iWs,7348
+gamesentenceminer-2.16.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.16.7.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.16.7.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.16.7.dist-info/RECORD,,