diff --git a/chat/python/services_router/query2sql_service.py b/chat/python/services_router/query2sql_service.py index cef37c215..b86d154dc 100644 --- a/chat/python/services_router/query2sql_service.py +++ b/chat/python/services_router/query2sql_service.py @@ -50,11 +50,11 @@ async def query2sql(query_body: Mapping[str, Any]): else: sql_generation_mode = query_body['sqlGenerationMode'] - model_name = schema['modelName'] + viewName = schema['viewName'] fields_list = schema['fieldNameList'] prior_schema_links = {item['fieldValue']:item['fieldName'] for item in linking} - resp = await text2sql_agent_router.async_query2sql(question=query_text, filter_condition=filter_condition, model_name=model_name, fields_list=fields_list, + resp = await text2sql_agent_router.async_query2sql(question=query_text, filter_condition=filter_condition, model_name=viewName, fields_list=fields_list, data_date=current_date, prior_schema_links=prior_schema_links, prior_exts=prior_exts, sql_generation_mode=sql_generation_mode) return resp diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java similarity index 99% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java index 31dd472b2..81d3da1cb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java @@ -50,7 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; @Service -public class DataSetImpl +public class DataSetServiceImpl extends ServiceImpl implements DataSetService { protected final Cache> dataSetSchemaCache = diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java index c1a5cf9df..6341b2ffc 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java @@ -1,8 +1,5 @@ package com.tencent.supersonic.headless.server.service; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DataFormat; @@ -22,15 +19,19 @@ import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository; +import com.tencent.supersonic.headless.server.service.impl.DataSetServiceImpl; import com.tencent.supersonic.headless.server.service.impl.MetricServiceImpl; -import com.tencent.supersonic.headless.server.service.impl.DataSetImpl; import com.tencent.supersonic.headless.server.utils.MetricConverter; -import java.util.HashMap; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.context.ApplicationEventPublisher; +import java.util.HashMap; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + public class MetricServiceImplTest { @Test @@ -66,9 +67,9 @@ public class MetricServiceImplTest { ChatGptHelper chatGptHelper = Mockito.mock(ChatGptHelper.class); CollectService collectService = Mockito.mock(CollectService.class); ApplicationEventPublisher eventPublisher = Mockito.mock(ApplicationEventPublisher.class); - DataSetService viewService = Mockito.mock(DataSetImpl.class); + DataSetService dataSetService = Mockito.mock(DataSetServiceImpl.class); DimensionService dimensionService = Mockito.mock(DimensionService.class); - return new MetricServiceImpl(metricRepository, modelService, chatGptHelper, collectService, viewService, + return new MetricServiceImpl(metricRepository, modelService, chatGptHelper, collectService, dataSetService, eventPublisher, dimensionService); }