From 24748357a7fe1e28f1b5bb12ab10200c222929eb Mon Sep 17 00:00:00 2001
From: Max Callaghan <max.w.callaghan@gmail.com>
Date: Tue, 30 Jul 2024 12:03:57 +0200
Subject: [PATCH] new deduplication logic for imports
---
server/api/routes/search.py | 2 +-
server/pipelines/tasks/imports.py | 2 +-
server/util/config.py | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/api/routes/search.py b/server/api/routes/search.py
index 45451ef..8be3660 100644
--- a/server/api/routes/search.py
+++ b/server/api/routes/search.py
@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from nacsos_data.db.engine import ensure_session
from nacsos_data.db.schemas import Project, ItemType
from nacsos_data.util.nql import NQLQuery, NQLFilter
-from nacsos_data.util.academic.openalex import query_async, SearchResult
+from nacsos_data.util.academic.readers.openalex import query_async, SearchResult
from nacsos_data.models.items import AcademicItemModel, FullLexisNexisItemModel, GenericItemModel
from nacsos_data.models.openalex.solr import SearchField, DefType, OpType
diff --git a/server/pipelines/tasks/imports.py b/server/pipelines/tasks/imports.py
index b333911..f9f20fb 100644
--- a/server/pipelines/tasks/imports.py
+++ b/server/pipelines/tasks/imports.py
@@ -7,7 +7,7 @@ from nacsos_data.db import get_engine_async
from nacsos_data.db.schemas import Import
from nacsos_data.models.imports import ImportConfig, ImportModel
from nacsos_data.util import ensure_values
-from nacsos_data.util.academic.importing import (
+from nacsos_data.util.academic.importer import (
import_wos_files,
import_openalex_files,
import_academic_db,
diff --git a/server/util/config.py b/server/util/config.py
index 1060d62..2362128 100644
--- a/server/util/config.py
+++ b/server/util/config.py
@@ -154,7 +154,7 @@ class Settings(BaseSettings):
EMAIL: EmailConfig
- LOG_CONF_FILE: str = 'config/logging.conf'
+ LOG_CONF_FILE: str = 'config/logging.toml'
LOGGING_CONF: dict[str, Any] | None = None
@field_validator('LOGGING_CONF', mode='before')
@@ -165,6 +165,7 @@ class Settings(BaseSettings):
if isinstance(v, dict):
return v
filename = info.data.get('LOG_CONF_FILE', None)
+ print(info.data)
if filename is not None:
with open(filename, 'r') as f:
ret = toml.loads(f.read())
--
GitLab