Standardize logging initialization

model-engine/model_engine_server/api/app.py

@@ -24,11 +24,11 @@
 from model_engine_server.core.loggers import (
     LoggerTagKey,
     LoggerTagManager,
-    filename_wo_ext,
+    logger_name,
     make_logger,
 )
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 app = FastAPI(title="launch", version="1.0.0", redoc_url="/api")
 

model-engine/model_engine_server/api/batch_jobs_v1.py

@@ -22,7 +22,7 @@
     UpdateDockerImageBatchJobV1Response,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     DockerImageNotFoundException,
     EndpointLabelsException,
@@ -43,7 +43,7 @@
 
 batch_job_router_v1 = APIRouter(prefix="/v1")
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @batch_job_router_v1.post("/batch-jobs", response_model=CreateBatchJobV1Response)

model-engine/model_engine_server/api/dependencies.py

@@ -16,7 +16,7 @@
 from model_engine_server.core.loggers import (
     LoggerTagKey,
     LoggerTagManager,
-    filename_wo_ext,
+    logger_name,
     make_logger,
 )
 from model_engine_server.db.base import SessionAsync, SessionReadOnlyAsync
@@ -100,7 +100,7 @@
 )
 from sqlalchemy.ext.asyncio import AsyncSession, async_scoped_session
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 AUTH = HTTPBasic(auto_error=False)
 

model-engine/model_engine_server/api/docker_image_batch_job_bundles_v1.py

@@ -15,7 +15,7 @@
 )
 from model_engine_server.common.dtos.model_bundles import ModelBundleOrderBy
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     EndpointResourceInvalidRequestException,
     ObjectNotAuthorizedException,
@@ -30,7 +30,7 @@
 
 docker_image_batch_job_bundle_router_v1 = APIRouter(prefix="/v1")
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @docker_image_batch_job_bundle_router_v1.post(

model-engine/model_engine_server/api/files_v1.py

@@ -16,7 +16,7 @@
     UploadFileResponse,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     ObjectNotAuthorizedException,
     ObjectNotFoundException,
@@ -30,7 +30,7 @@
 )
 
 file_router_v1 = APIRouter(prefix="/v1")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @file_router_v1.post("/files", response_model=UploadFileResponse)

model-engine/model_engine_server/api/llms_v1.py

@@ -39,7 +39,7 @@
 from model_engine_server.core.loggers import (
     LoggerTagKey,
     LoggerTagManager,
-    filename_wo_ext,
+    logger_name,
     make_logger,
 )
 from model_engine_server.domain.exceptions import (
@@ -78,7 +78,7 @@
 from sse_starlette.sse import EventSourceResponse
 
 llm_router_v1 = APIRouter(prefix="/v1/llm")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 def handle_streaming_exception(

model-engine/model_engine_server/api/model_bundles_v1.py

@@ -19,7 +19,7 @@
     ModelBundleV1Response,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     DockerImageNotFoundException,
     ObjectHasInvalidValueException,
@@ -35,7 +35,7 @@
 )
 
 model_bundle_router_v1 = APIRouter(prefix="/v1")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @model_bundle_router_v1.post("/model-bundles", response_model=CreateModelBundleV1Response)

model-engine/model_engine_server/api/model_bundles_v2.py

@@ -19,7 +19,7 @@
     ModelBundleV2Response,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     DockerImageNotFoundException,
     ObjectHasInvalidValueException,
@@ -35,7 +35,7 @@
 )
 
 model_bundle_router_v2 = APIRouter(prefix="/v2")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @model_bundle_router_v2.post("/model-bundles", response_model=CreateModelBundleV2Response)

model-engine/model_engine_server/api/model_endpoints_docs_v1.py

@@ -8,14 +8,14 @@
     verify_authentication,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.use_cases.model_endpoints_schema_use_cases import (
     GetModelEndpointsSchemaV1UseCase,
 )
 from starlette.responses import HTMLResponse
 
 model_endpoints_docs_router_v1 = APIRouter(prefix="/v1")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @model_endpoints_docs_router_v1.get("/model-endpoints-schema.json")

model-engine/model_engine_server/api/model_endpoints_v1.py

@@ -24,7 +24,7 @@
     UpdateModelEndpointV1Response,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     EndpointDeleteFailedException,
     EndpointLabelsException,
@@ -45,7 +45,7 @@
 )
 
 model_endpoint_router_v1 = APIRouter(prefix="/v1")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @model_endpoint_router_v1.post("/model-endpoints", response_model=CreateModelEndpointV1Response)

model-engine/model_engine_server/api/tasks_v1.py

@@ -16,7 +16,7 @@
     TaskStatus,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     EndpointUnsupportedInferenceTypeException,
     ObjectNotAuthorizedException,
@@ -36,7 +36,7 @@
 from sse_starlette.sse import EventSourceResponse
 
 inference_task_router_v1 = APIRouter(prefix="/v1")
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @inference_task_router_v1.post("/async-tasks", response_model=CreateAsyncTaskV1Response)

model-engine/model_engine_server/api/triggers_v1.py

@@ -15,7 +15,7 @@
     UpdateTriggerV1Response,
 )
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.exceptions import (
     CronSyntaxException,
     DockerImageNotFoundException,
@@ -36,7 +36,7 @@
 
 trigger_router_v1 = APIRouter(prefix="/v1")
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 @trigger_router_v1.post("/triggers", response_model=CreateTriggerV1Response)

model-engine/model_engine_server/common/config.py

@@ -7,9 +7,9 @@
 from typing import Sequence
 
 import yaml
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 __all__: Sequence[str] = (
     "DEFAULT_SERVICE_CONFIG_PATH",

model-engine/model_engine_server/common/resource_limits.py

@@ -1,6 +1,6 @@
 from typing import Optional, Union, cast
 
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.entities import (
     CpuSpecificationType,
     GpuType,
@@ -48,7 +48,7 @@
 FORWARDER_STORAGE_USAGE = "1G"
 FORWARDER_WORKER_COUNT = 2
 
-logger = make_logger(filename_wo_ext(__name__))
+logger = make_logger(logger_name())
 
 
 def validate_resource_requests(

model-engine/model_engine_server/common/service_requests.py

@@ -4,7 +4,7 @@
 
 import requests
 from model_engine_server.common.errors import HTTP429Exception, UpstreamHTTPSvcError
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from tenacity import (
     RetryError,
     Retrying,
@@ -13,7 +13,7 @@
     wait_exponential,
 )
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 SYNC_ENDPOINT_RETRIES = 10  # Must be an integer >= 0
 SYNC_ENDPOINT_MAX_TIMEOUT_SECONDS = 10

model-engine/model_engine_server/core/aws/secrets.py

@@ -6,9 +6,9 @@
 import boto3
 from botocore.exceptions import ClientError
 from model_engine_server.core.config import infra_config
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 
 @lru_cache(maxsize=2)

model-engine/model_engine_server/core/config.py

@@ -12,9 +12,9 @@
 from typing import Optional, Sequence
 
 import yaml
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 __all__: Sequence[str] = (
     "DEFAULT_CONFIG_PATH",

model-engine/model_engine_server/core/docker/docker_image.py

@@ -5,7 +5,6 @@
 """
 
 import base64
-import logging
 import os
 import pathlib
 import subprocess
@@ -17,11 +16,11 @@
 import click
 import docker
 from model_engine_server.core.config import infra_config
-from model_engine_server.core.loggers import make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 
 from .remote_build import MODELS_ROOT, build_remote_wrapper
 
-logger = make_logger("ml_serve.docker_image", log_level=logging.INFO)
+logger = make_logger(logger_name())
 
 
 def _get_aws_creds() -> Dict[str, str]:

model-engine/model_engine_server/core/loggers.py

@@ -33,7 +33,6 @@
     "silence_chatty_logger",
     "loggers_at_level",
     # utils
-    "filename_wo_ext",
     "LoggerTagKey",
     "LoggerTagManager",
 )
@@ -202,7 +201,7 @@ def logger_name(*, fallback_name: Optional[str] = None) -> str:
         # in which case we use it's file name
 
         if hasattr(calling_module, "__file__"):
-            return filename_wo_ext(calling_module.__file__)  # type: ignore
+            return _filename_wo_ext(calling_module.__file__)  # type: ignore
         if fallback_name is not None:
             fallback_name = fallback_name.strip()
             if len(fallback_name) > 0:
@@ -316,6 +315,6 @@ def loggers_at_level(*loggers_or_names, new_level: int) -> None:  # type: ignore
             log.setLevel(level)
 
 
-def filename_wo_ext(filename: str) -> str:
+def _filename_wo_ext(filename: str) -> str:
     """Gets the filename, without the file extension, if present."""
     return os.path.split(filename)[1].split(".", 1)[0]

model-engine/model_engine_server/core/utils/timer.py

@@ -26,9 +26,8 @@ class timer:  # pylint: disable=invalid-name
     The other use case is to pass in a `name` and a `logger`. The timing will be recorded
     when the context block is exited:
 
-    >>> from model_engine_server.core.loggers import make_logger
-    >>>
-    >>> log = make_logger("my-main-program")
+    >>> from model_engine_server.core.loggers import make_logger, logger_name    >>>
+    >>> log = make_logger(logger_name())
     >>>
     >>> with timer(logger=log, name="timing-func-f"):
     >>>     f()

model-engine/model_engine_server/db/base.py

@@ -6,14 +6,14 @@
 import sqlalchemy
 from model_engine_server.core.aws.secrets import get_key_file
 from model_engine_server.core.config import infra_config
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from sqlalchemy import create_engine
 from sqlalchemy.ext.asyncio import async_scoped_session, async_sessionmaker, create_async_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.pool import NullPool
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 
 def get_key_file_name(environment: str) -> str:

model-engine/model_engine_server/db/endpoint_row_lock.py

@@ -4,12 +4,12 @@
 import time
 from contextlib import AbstractContextManager
 
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from sqlalchemy import BIGINT, cast, func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm.session import Session
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 BLOCKING_LOCK_TIMEOUT_SECONDS = 120
 BLOCKING_LOCK_TIMEOUT_POLL_FREQ_SECONDS = 0.5

model-engine/model_engine_server/domain/use_cases/batch_job_use_cases.py

@@ -17,7 +17,7 @@
 )
 from model_engine_server.common.resource_limits import validate_resource_requests
 from model_engine_server.core.auth.authentication_repository import User
-from model_engine_server.core.loggers import filename_wo_ext, make_logger
+from model_engine_server.core.loggers import logger_name, make_logger
 from model_engine_server.domain.authorization.live_authorization_module import (
     LiveAuthorizationModule,
 )
@@ -41,7 +41,7 @@
     validate_labels,
 )
 
-logger = make_logger(filename_wo_ext(__file__))
+logger = make_logger(logger_name())
 
 
 class CreateBatchJobV1UseCase: