chore: solve the codebase change after rebasing the main branch

Canner · Jan 24, 2025 · 176b6ee · 176b6ee
1 parent c036653
commit 176b6ee
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 43 deletions.
diff --git a/wren-ai-service/docs/config_examples/config.google_ai_studio.yaml b/wren-ai-service/docs/config_examples/config.google_ai_studio.yaml
@@ -80,7 +80,7 @@ pipes:
   - name: sql_regeneration
     llm: litellm_llm.gemini/gemini-2.0-flash-exp
     engine: wren_ui
-  - name: semantics_description
+  - name: semantics_enrichment
     llm: litellm_llm.gemini/gemini-2.0-flash-exp
   - name: relationship_recommendation
     llm: litellm_llm.gemini/gemini-2.0-flash-exp

diff --git a/wren-ai-service/docs/config_examples/config.groq.yaml b/wren-ai-service/docs/config_examples/config.groq.yaml
@@ -81,7 +81,7 @@ pipes:
   - name: sql_regeneration
     llm: litellm_llm.groq/llama-3.3-70b-specdec
     engine: wren_ui
-  - name: semantics_description
+  - name: semantics_enrichment
     llm: litellm_llm.groq/llama-3.3-70b-specdec
   - name: relationship_recommendation
     llm: litellm_llm.groq/llama-3.3-70b-specdec

diff --git a/wren-ai-service/docs/config_examples/config.ollama.yaml b/wren-ai-service/docs/config_examples/config.ollama.yaml
@@ -80,7 +80,7 @@ pipes:
   - name: sql_regeneration
     llm: litellm_llm.openai/phi4:14b
     engine: wren_ui
-  - name: semantics_description
+  - name: semantics_enrichment
     llm: litellm_llm.openai/phi4:14b
   - name: relationship_recommendation
     llm: litellm_llm.openai/phi4:14b

diff --git a/wren-ai-service/src/globals.py b/wren-ai-service/src/globals.py
@@ -29,18 +29,18 @@
 class ServiceContainer:
     ask_service: AskService
     ask_details_service: AskDetailsService
+    chart_service: ChartService
+    chart_adjustment_service: ChartAdjustmentService
     question_recommendation: QuestionRecommendation
     relationship_recommendation: RelationshipRecommendation
     semantics_enrichment: SemanticsEnrichment
     semantics_preparation_service: SemanticsPreparationService
-    chart_service: ChartService
-    chart_adjustment_service: ChartAdjustmentService
     sql_answer_service: SqlAnswerService
     sql_expansion_service: SqlExpansionService
     sql_explanation_service: SqlExplanationService
-    sql_regeneration_service: SqlRegenerationService
     sql_pairs_preparation_service: SqlPairsPreparationService
     sql_question_service: SqlQuestionService
+    sql_regeneration_service: SqlRegenerationService
 
 
 @dataclass

diff --git a/wren-ai-service/src/pipelines/generation/__init__.py b/wren-ai-service/src/pipelines/generation/__init__.py
@@ -6,14 +6,6 @@
 from .question_recommendation import QuestionRecommendation
 from .relationship_recommendation import RelationshipRecommendation
 from .semantics_enrichment import SemanticsEnrichment
-from .chart_adjustment import ChartAdjustment
-from .chart_generation import ChartGeneration
-from .data_assistance import DataAssistance
-from .followup_sql_generation import FollowUpSQLGeneration
-from .intent_classification import IntentClassification
-from .question_recommendation import QuestionRecommendation
-from .relationship_recommendation import RelationshipRecommendation
-from .semantics_description import SemanticsDescription
 from .sql_answer import SQLAnswer
 from .sql_breakdown import SQLBreakdown
 from .sql_correction import SQLCorrection
@@ -25,28 +17,6 @@
 from .sql_regeneration import SQLRegeneration
 from .sql_summary import SQLSummary
 
-__all__ = [
-    "SQLRegeneration",
-    "ChartGeneration",
-    "ChartAdjustment",
-    "DataAssistance",
-    "FollowUpSQLGeneration",
-    "IntentClassification",
-    "QuestionRecommendation",
-    "RelationshipRecommendation",
-    "SemanticsDescription",
-    "SQLAnswer",
-    "SQLBreakdown",
-    "SQLCorrection",
-    "SQLExpansion",
-    "SQLExplanation",
-    "SQLGeneration",
-    "SQLGenerationReasoning",
-    "SQLSummary",
-    "SQLQuestion",
-]
-from .model_semantics import ModelSemantics
-
 __all__ = [
     "ChartAdjustment",
     "ChartGeneration",
@@ -62,6 +32,8 @@
     "SQLExpansion",
     "SQLExplanation",
     "SQLGeneration",
+    "SQLGenerationReasoning",
+    "SQLQuestion",
     "SQLRegeneration",
     "SQLSummary",
 ]
diff --git a/wren-ai-service/src/pipelines/indexing/__init__.py b/wren-ai-service/src/pipelines/indexing/__init__.py
@@ -120,8 +120,8 @@ async def run(
 
 __all__ = [
     "DBSchema",
-    "TableDescription",
     "HistoricalQuestion",
-    "SqlPairsDeletion",
     "SqlPairs",
+    "SqlPairsDeletion",
+    "TableDescription",
 ]
diff --git a/wren-ai-service/src/web/v1/routers/__init__.py b/wren-ai-service/src/web/v1/routers/__init__.py
@@ -7,10 +7,8 @@
     chart_adjustment,
     question_recommendation,
     relationship_recommendation,
-    semantics_description,
-    semantics_preparation,
     semantics_enrichment,
-    semantics_preparations,
+    semantics_preparation,
     sql_answers,
     sql_expansions,
     sql_explanations,
@@ -25,8 +23,6 @@
 router.include_router(question_recommendation.router)
 router.include_router(relationship_recommendation.router)
 router.include_router(semantics_enrichment.router)
-router.include_router(semantics_preparations.router)
-router.include_router(semantics_description.router)
 router.include_router(semantics_preparation.router)
 router.include_router(sql_answers.router)
 router.include_router(sql_expansions.router)