diff --git a/WORKSPACE b/WORKSPACE index c55efd9..5452caf 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -229,6 +229,18 @@ container_repositories() load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps") +# ToDo: temorary fix as registry was broken at 24.04.2021 +load("@bazel_gazelle//:deps.bzl", "go_repository") + +go_repository( + name = "com_github_google_go_containerregistry", + importpath = "github.com/google/go-containerregistry", + sha256 = "60b9a600affa5667bd444019a4e218b7752d8500cfa923c1ac54ce2f88f773e2", + strip_prefix = "google-go-containerregistry-8a28419", + type = "tar.gz", + urls = ["https://api.github.com/repos/google/go-containerregistry/tarball/8a2841911ffee4f6892ca0083e89752fb46c48dd"], # v0.1.4 +) + container_deps() load("@io_bazel_rules_docker//repositories:py_repositories.bzl", "py_deps") diff --git a/library/aiogrpctools/BUILD.bazel b/library/aiogrpctools/BUILD.bazel index fc08218..d0dd791 100644 --- a/library/aiogrpctools/BUILD.bazel +++ b/library/aiogrpctools/BUILD.bazel @@ -11,6 +11,7 @@ py_library( visibility = ["//visibility:public"], deps = [ requirement("grpcio"), + requirement("pyyaml"), requirement("aiokit"), "//library/configurator", "//library/logging", diff --git a/library/aiogrpctools/base.py b/library/aiogrpctools/base.py index 4cf690c..ce94f61 100644 --- a/library/aiogrpctools/base.py +++ b/library/aiogrpctools/base.py @@ -1,6 +1,7 @@ import logging from functools import wraps +import yaml from aiokit import ( AioRootThing, AioThing, @@ -36,6 +37,11 @@ class AioGrpcServer(AioRootThing): }) await self.server.stop(None) + def log_config(self, config): + logging.getLogger('debug').info( + '\n' + yaml.safe_dump(config.get_files()), + ) + class BaseService(AioThing): error_mapping = {} diff --git a/library/configurator/__init__.py b/library/configurator/__init__.py index e474d9e..781cea8 100644 --- a/library/configurator/__init__.py +++ b/library/configurator/__init__.py @@ -153,3 +153,6 @@ class Configurator(RichDict): def has_file(self, basename): return basename in self._by_basenames + + def get_files(self): + return self._by_basenames diff --git a/nexus/hub/main.py b/nexus/hub/main.py index e53d233..309e35d 100644 --- a/nexus/hub/main.py +++ b/nexus/hub/main.py @@ -13,6 +13,7 @@ from nexus.hub.services.submitter import SubmitterService class GrpcServer(AioGrpcServer): def __init__(self, config: Configurator): + self.log_config(config) super().__init__(address=config['grpc']['address'], port=config['grpc']['port']) self.pool_holder = AioPostgresPoolHolder( dsn=f'dbname={config["database"]["database"]} ' diff --git a/nexus/meta_api/BUILD.bazel b/nexus/meta_api/BUILD.bazel index c4ada9c..014ea26 100644 --- a/nexus/meta_api/BUILD.bazel +++ b/nexus/meta_api/BUILD.bazel @@ -1,5 +1,6 @@ load("@io_bazel_rules_docker//python3:image.bzl", "py3_image") load("@io_bazel_rules_docker//container:container.bzl", "container_push") + load("@pip_modules//:requirements.bzl", "requirement") alias( @@ -46,31 +47,13 @@ py3_image( ], ) -py3_image( - name = "learn", - srcs = ["learn.py"], - base = "//images/production:base-python-image", - main = "learn.py", - srcs_version = "PY3ONLY", - visibility = ["//visibility:public"], - deps = [ - requirement("fire"), - requirement("lightgbm"), - requirement("numpy"), - requirement("orjson"), - requirement("pandas"), - "//nexus/meta_api/proto:meta_api_proto_py", - requirement("izihawa_utils"), - ], -) - py_binary( name = "cli", srcs = ["cli.py"], main = "cli.py", deps = [ - "//nexus/meta_api/aioclient", requirement("fire"), + "//nexus/meta_api/aioclient", ], ) diff --git a/nexus/meta_api/README.md b/nexus/meta_api/README.md index 695ccf2..e47d77d 100644 --- a/nexus/meta_api/README.md +++ b/nexus/meta_api/README.md @@ -1 +1,5 @@ -# Nexus Search: Meta API \ No newline at end of file +# Nexus Search: Meta API + +``` +NEXUS_META_API_summa.url=http://summa bazel run -c opt binary +``` \ No newline at end of file diff --git a/nexus/meta_api/configs/base.yaml b/nexus/meta_api/configs/base.yaml index b8a49d1..f00656c 100644 --- a/nexus/meta_api/configs/base.yaml +++ b/nexus/meta_api/configs/base.yaml @@ -12,9 +12,11 @@ grpc: host: 0.0.0.0 port: 9090 log_path: '/var/log/nexus-meta-api' +metrics: + enabled: false stat_provider: enabled: false summa: timeout: 15 ttl_dns_cache: 30 - url: + url: http://summa diff --git a/nexus/meta_api/main.py b/nexus/meta_api/main.py index 20993c2..e3c4d1e 100644 --- a/nexus/meta_api/main.py +++ b/nexus/meta_api/main.py @@ -15,6 +15,7 @@ from nexus.meta_api.services.search import SearchService class GrpcServer(AioGrpcServer): def __init__(self, config): + self.log_config(config) super().__init__(address=config['grpc']['host'], port=config['grpc']['port']) self.config = config diff --git a/rules/python/requirements.txt b/rules/python/requirements.txt index 5e3d6c0..0906139 100644 --- a/rules/python/requirements.txt +++ b/rules/python/requirements.txt @@ -64,7 +64,7 @@ idna==2.10 isort==5.8.0 itsdangerous==1.1.0 izihawa_types==0.1.0 -izihawa_utils==0.3.1 +izihawa_utils==0.3.2 Jinja2==2.11.3 jupyter==1.0.0 kazoo==2.8.0