Skip to content
Merged
7 changes: 2 additions & 5 deletions components/clp-mcp-server/clp_mcp_server/clp_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
from clp_py_utils.clp_config import CLP_DEFAULT_DATASET_NAME
from pymongo import AsyncMongoClient

from .constants import (
from clp_mcp_server.constants import (
POLLING_INTERVAL_SECONDS,
QueryJobStatus,
QueryJobType,
SEARCH_MAX_NUM_RESULTS,
)
from .settings import (
CLP_DB_PASS,
CLP_DB_USER,
)
from clp_mcp_server.settings import CLP_DB_PASS, CLP_DB_USER


class ClpConnector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from clp_py_utils.core import read_yaml_config_file
from pydantic import ValidationError

from .server import create_mcp_server
from clp_mcp_server.server import create_mcp_server

logger = get_logger(MCP_SERVER_COMPONENT_NAME)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Server module."""

from .server import create_mcp_server
from clp_mcp_server.server.server import create_mcp_server

__all__ = ["create_mcp_server"]
11 changes: 7 additions & 4 deletions components/clp-mcp-server/clp_mcp_server/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
from starlette.responses import PlainTextResponse

from clp_mcp_server.clp_connector import ClpConnector

from . import constants
from .session_manager import SessionManager
from .utils import format_query_results, parse_timestamp_range, sort_by_timestamp
from clp_mcp_server.server import constants
from clp_mcp_server.server.session_manager import SessionManager
from clp_mcp_server.server.utils import (
format_query_results,
parse_timestamp_range,
sort_by_timestamp,
)


def create_mcp_server(clp_config: ClpConfig) -> FastMCP:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from paginate import Page

from . import constants
from clp_mcp_server.server import constants


class PaginatedQueryResult:
Expand Down
2 changes: 1 addition & 1 deletion components/clp-mcp-server/clp_mcp_server/server/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from datetime import datetime, timezone
from typing import Any

from .constants import TIMESTAMP_NOT_AVAILABLE
from clp_mcp_server.server.constants import TIMESTAMP_NOT_AVAILABLE

logger = logging.getLogger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions components/clp-py-utils/clp_py_utils/clp_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
)
from strenum import KebabCaseStrEnum, LowercaseStrEnum

from .clp_logging import LoggingLevel
from .core import (
from clp_py_utils.clp_logging import LoggingLevel
from clp_py_utils.core import (
get_config_value,
make_config_path_absolute,
read_yaml_config_file,
resolve_host_path_in_container,
validate_path_could_be_dir,
)
from .serialization_utils import serialize_path, serialize_str_enum
from clp_py_utils.serialization_utils import serialize_path, serialize_str_enum

# Constants
# Component names
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

from pathlib import Path

from clp_py_utils.clp_config import (
ArchiveOutput,
StorageType,
)
from clp_py_utils.clp_config import ArchiveOutput, StorageType

# Constants
MYSQL_TABLE_NAME_MAX_LEN = 64
Expand Down
6 changes: 2 additions & 4 deletions components/clp-py-utils/clp_py_utils/create-db-tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ def main(argv):
config_file_path = pathlib.Path(parsed_args.config)
storage_engine = StorageEngine(parsed_args.storage_engine)

script_dir = pathlib.Path(__file__).parent.resolve()

# fmt: off
cmd = [
"python3", str(script_dir / "initialize-clp-metadata-db.py"),
"python3", "-m", "clp_py_utils.initialize-clp-metadata-db",
"--config", str(config_file_path),
"--storage-engine", str(storage_engine),
]
Expand All @@ -45,7 +43,7 @@ def main(argv):

# fmt: off
cmd = [
"python3", str(script_dir / "initialize-orchestration-db.py"),
"python3", "-m", "clp_py_utils.initialize-orchestration-db",
"--config", str(config_file_path),
]
# fmt: on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,11 @@
from contextlib import closing

from pydantic import ValidationError
from sql_adapter import SqlAdapter

from clp_py_utils.clp_config import (
ClpConfig,
StorageEngine,
)
from clp_py_utils.clp_metadata_db_utils import (
create_datasets_table,
create_metadata_db_tables,
)
from clp_py_utils.clp_config import ClpConfig, StorageEngine
from clp_py_utils.clp_metadata_db_utils import create_datasets_table, create_metadata_db_tables
from clp_py_utils.core import read_yaml_config_file
from clp_py_utils.sql_adapter import SqlAdapter

# Setup logging
# Create logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
QueryTaskStatus,
)
from pydantic import ValidationError
from sql_adapter import SqlAdapter

from clp_py_utils.clp_config import (
ClpConfig,
Expand All @@ -22,6 +21,7 @@
QUERY_TASKS_TABLE_NAME,
)
from clp_py_utils.core import read_yaml_config_file
from clp_py_utils.sql_adapter import SqlAdapter

# Setup logging
# Create logger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from celery import Celery

from . import celeryconfig
from job_orchestration.executor.compress import celeryconfig

app = Celery("compress")
app.config_from_object(celeryconfig)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from celery import Celery

from . import celeryconfig
from job_orchestration.executor.query import celeryconfig

app = Celery("query")
app.config_from_object(celeryconfig)
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/deps-download/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
project_root_dir="$script_dir/../../../"
download_dep_script="$script_dir/download-dep.py"

readonly YSCOPE_DEV_UTILS_COMMIT_SHA="49e07491790bb9a0adae10b1a125e9fd9b9eb487"
readonly YSCOPE_DEV_UTILS_COMMIT_SHA="307e711fe8bdab29a8aa23bb1f1212748df3f144"
python3 "${download_dep_script}" \
"https://github.com/y-scope/yscope-dev-utils/archive/${YSCOPE_DEV_UTILS_COMMIT_SHA}.zip" \
"yscope-dev-utils-${YSCOPE_DEV_UTILS_COMMIT_SHA}" \
Expand Down
2 changes: 1 addition & 1 deletion tools/yscope-dev-utils
Loading