diff --git a/api/db/db_models.py b/api/db/db_models.py index 95ad570c5..84b3b110a 100644 --- a/api/db/db_models.py +++ b/api/db/db_models.py @@ -50,7 +50,6 @@ class TextFieldType(Enum): MYSQL = "LONGTEXT" OCEANBASE = "LONGTEXT" POSTGRES = "TEXT" - POSTGRES = "TEXT" class LongTextField(TextField): diff --git a/tests/unit/test_oceanbase_peewee.py b/tests/unit/test_oceanbase_peewee.py index 9156e8dc5..7ff0ef2d2 100644 --- a/tests/unit/test_oceanbase_peewee.py +++ b/tests/unit/test_oceanbase_peewee.py @@ -3,7 +3,6 @@ Tests for OceanBase Peewee ORM support. """ import pytest -from unittest.mock import Mock, patch, MagicMock from api.db.db_models import ( RetryingPooledOceanBaseDatabase, PooledDatabase, diff --git a/tools/es-to-oceanbase-migration/src/es_ob_migration/cli.py b/tools/es-to-oceanbase-migration/src/es_ob_migration/cli.py index bc703266f..bb3ec2477 100644 --- a/tools/es-to-oceanbase-migration/src/es_ob_migration/cli.py +++ b/tools/es-to-oceanbase-migration/src/es_ob_migration/cli.py @@ -15,7 +15,6 @@ from .es_client import ESClient from .ob_client import OBClient from .migrator import ESToOceanBaseMigrator from .verify import MigrationVerifier -from .schema import RAGFLOW_COLUMNS console = Console() @@ -115,7 +114,7 @@ def migrate( indices_to_migrate = [(index, table if table else index)] else: # Auto-discover all ragflow_* indices - console.print(f"\n[cyan]Discovering RAGFlow indices...[/]") + console.print("\n[cyan]Discovering RAGFlow indices...[/]") ragflow_indices = es_client.list_ragflow_indices() if not ragflow_indices: @@ -166,7 +165,7 @@ def migrate( # Summary for multiple indices if len(indices_to_migrate) > 1: console.print(f"\n[bold]{'='*60}[/]") - console.print(f"[bold]Migration Summary[/]") + console.print("[bold]Migration Summary[/]") console.print(f"[bold]{'='*60}[/]") console.print(f" Total indices: {len(indices_to_migrate)}") console.print(f" [green]Successful: {total_success}[/]") @@ -232,13 +231,13 @@ def schema(ctx, es_host, es_port, es_user, es_password, index, output): # Vector fields if analysis['vector_fields']: - console.print(f"\n[cyan]Vector fields detected:[/]") + console.print("\n[cyan]Vector fields detected:[/]") for vf in analysis['vector_fields']: console.print(f" - {vf['name']} (dimension: {vf['dimension']})") # Unknown fields if analysis['unknown_fields']: - console.print(f"\n[yellow]Unknown fields (will be stored in 'extra'):[/]") + console.print("\n[yellow]Unknown fields (will be stored in 'extra'):[/]") for uf in analysis['unknown_fields']: console.print(f" - {uf}") diff --git a/tools/es-to-oceanbase-migration/src/es_ob_migration/migrator.py b/tools/es-to-oceanbase-migration/src/es_ob_migration/migrator.py index ef59e34d1..ba194dcd1 100644 --- a/tools/es-to-oceanbase-migration/src/es_ob_migration/migrator.py +++ b/tools/es-to-oceanbase-migration/src/es_ob_migration/migrator.py @@ -18,7 +18,7 @@ from rich.progress import ( from .es_client import ESClient from .ob_client import OBClient -from .schema import RAGFlowSchemaConverter, RAGFlowDataConverter, VECTOR_FIELD_PATTERN +from .schema import RAGFlowSchemaConverter, RAGFlowDataConverter from .progress import ProgressManager, MigrationProgress from .verify import MigrationVerifier diff --git a/tools/es-to-oceanbase-migration/src/es_ob_migration/ob_client.py b/tools/es-to-oceanbase-migration/src/es_ob_migration/ob_client.py index 4d5a7b234..50a6d92de 100644 --- a/tools/es-to-oceanbase-migration/src/es_ob_migration/ob_client.py +++ b/tools/es-to-oceanbase-migration/src/es_ob_migration/ob_client.py @@ -4,15 +4,14 @@ OceanBase Client for RAGFlow data migration. This client is specifically designed for RAGFlow's data structure. """ -import json import logging from typing import Any from pyobvector import ObVecClient, FtsIndexParam, FtsParser, VECTOR, ARRAY -from sqlalchemy import Column, String, Integer, Float, JSON, Text, text, Double +from sqlalchemy import Column, String, Integer, Float, JSON, Double from sqlalchemy.dialects.mysql import LONGTEXT, TEXT as MYSQL_TEXT -from .schema import RAGFLOW_COLUMNS, ARRAY_COLUMNS, FTS_COLUMNS_TKS +from .schema import RAGFLOW_COLUMNS, FTS_COLUMNS_TKS logger = logging.getLogger(__name__) diff --git a/tools/es-to-oceanbase-migration/src/es_ob_migration/progress.py b/tools/es-to-oceanbase-migration/src/es_ob_migration/progress.py index 738fb476a..29c23bb4b 100644 --- a/tools/es-to-oceanbase-migration/src/es_ob_migration/progress.py +++ b/tools/es-to-oceanbase-migration/src/es_ob_migration/progress.py @@ -4,7 +4,6 @@ Progress tracking and resume capability for migration. import json import logging -import os from dataclasses import dataclass, field, asdict from datetime import datetime from pathlib import Path diff --git a/tools/es-to-oceanbase-migration/src/es_ob_migration/verify.py b/tools/es-to-oceanbase-migration/src/es_ob_migration/verify.py index c02d2b525..0df94bbc9 100644 --- a/tools/es-to-oceanbase-migration/src/es_ob_migration/verify.py +++ b/tools/es-to-oceanbase-migration/src/es_ob_migration/verify.py @@ -9,7 +9,7 @@ from typing import Any from .es_client import ESClient from .ob_client import OBClient -from .schema import RAGFLOW_COLUMNS, ARRAY_COLUMNS, JSON_COLUMNS +from .schema import ARRAY_COLUMNS, JSON_COLUMNS logger = logging.getLogger(__name__) diff --git a/tools/es-to-oceanbase-migration/tests/test_progress.py b/tools/es-to-oceanbase-migration/tests/test_progress.py index 443c8db89..0e7368d54 100644 --- a/tools/es-to-oceanbase-migration/tests/test_progress.py +++ b/tools/es-to-oceanbase-migration/tests/test_progress.py @@ -7,7 +7,6 @@ import os import tempfile import pytest from pathlib import Path -from datetime import datetime from es_ob_migration.progress import MigrationProgress, ProgressManager @@ -90,7 +89,7 @@ class TestProgressManager: def test_create_progress_manager_creates_dir(self, temp_dir): """Test that progress manager creates directory.""" new_dir = os.path.join(temp_dir, "new_progress") - manager = ProgressManager(progress_dir=new_dir) + ProgressManager(progress_dir=new_dir) assert Path(new_dir).exists() def test_create_progress(self, manager): @@ -225,7 +224,7 @@ class TestProgressManager: def test_can_resume_running(self, manager): """Test can_resume for running migration.""" - progress = manager.create_progress( + manager.create_progress( es_index="ragflow_resume_running", ob_table="ragflow_resume_running", total_documents=1000, @@ -291,7 +290,7 @@ class TestProgressManager: def test_progress_file_path(self, manager): """Test progress file naming.""" - progress = manager.create_progress( + manager.create_progress( es_index="ragflow_abc123", ob_table="ragflow_abc123", total_documents=100, diff --git a/tools/es-to-oceanbase-migration/tests/test_schema.py b/tools/es-to-oceanbase-migration/tests/test_schema.py index 942de9449..cd55f98ce 100644 --- a/tools/es-to-oceanbase-migration/tests/test_schema.py +++ b/tools/es-to-oceanbase-migration/tests/test_schema.py @@ -9,7 +9,6 @@ This module tests: """ import json -import pytest from es_ob_migration.schema import ( RAGFlowSchemaConverter, RAGFlowDataConverter, diff --git a/tools/es-to-oceanbase-migration/tests/test_verify.py b/tools/es-to-oceanbase-migration/tests/test_verify.py index 6a5f288e7..d0b9ee225 100644 --- a/tools/es-to-oceanbase-migration/tests/test_verify.py +++ b/tools/es-to-oceanbase-migration/tests/test_verify.py @@ -2,9 +2,8 @@ Tests for migration verification. """ -import json import pytest -from unittest.mock import Mock, MagicMock +from unittest.mock import Mock from es_ob_migration.verify import MigrationVerifier, VerificationResult