chore: logger = logging.getLogger(__name__) --> logger = logging.getLogger('google_adk.' + __name__)

PiperOrigin-RevId: 759894901
This commit is contained in:
Wei Sun (Jack)
2025-05-16 23:03:27 -07:00
committed by Copybara-Service
parent 482099c925
commit 0d7d7918b6
34 changed files with 79 additions and 64 deletions
@@ -13,7 +13,9 @@
# limitations under the License.
import logging
from typing import List, Optional, Union
from typing import List
from typing import Optional
from typing import Union
from fastapi.openapi.models import HTTPBearer
from typing_extensions import override
@@ -34,8 +36,7 @@ from .clients.connections_client import ConnectionsClient
from .clients.integration_client import IntegrationClient
from .integration_connector_tool import IntegrationConnectorTool
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
# TODO(cheliu): Apply a common toolset interface
@@ -13,7 +13,10 @@
# limitations under the License.
import logging
from typing import Any, Dict, Optional, Union
from typing import Any
from typing import Dict
from typing import Optional
from typing import Union
from google.genai.types import FunctionDeclaration
from typing_extensions import override
@@ -26,8 +29,7 @@ from ..openapi_tool.openapi_spec_parser.rest_api_tool import to_gemini_schema
from ..openapi_tool.openapi_spec_parser.tool_auth_handler import ToolAuthHandler
from ..tool_context import ToolContext
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
class IntegrationConnectorTool(BaseTool):
@@ -24,11 +24,10 @@ from typing_extensions import override
from .base_tool import BaseTool
from .tool_context import ToolContext
if TYPE_CHECKING:
from ..models import LlmRequest
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
@deprecated(
@@ -35,7 +35,7 @@ _py_builtin_type_to_schema_type = {
dict: types.Type.OBJECT,
}
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
def _is_builtin_primitive_or_compound(
@@ -14,14 +14,15 @@
import logging
from typing import List, Optional, Union
from typing import List
from typing import Optional
from typing import Union
from google.adk.tools.base_toolset import ToolPredicate
from .google_api_toolset import GoogleApiToolset
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
class BigQueryToolset(GoogleApiToolset):
@@ -24,7 +24,7 @@ from googleapiclient.discovery import build
from googleapiclient.errors import HttpError
# Configure logging
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
class GoogleApiToOpenApiConverter:
+3 -2
View File
@@ -15,7 +15,8 @@
__all__ = []
try:
from .conversion_utils import adk_to_mcp_tool_type, gemini_to_json_schema
from .conversion_utils import adk_to_mcp_tool_type
from .conversion_utils import gemini_to_json_schema
from .mcp_tool import MCPTool
from .mcp_toolset import MCPToolset
@@ -30,7 +31,7 @@ except ImportError as e:
import logging
import sys
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
if sys.version_info < (3, 10):
logger.warning(
@@ -13,16 +13,21 @@
# limitations under the License.
import asyncio
from contextlib import AsyncExitStack, asynccontextmanager
from contextlib import asynccontextmanager
from contextlib import AsyncExitStack
import functools
import logging
import sys
from typing import Any, Optional, TextIO
from typing import Any
from typing import Optional
from typing import TextIO
import anyio
from pydantic import BaseModel
try:
from mcp import ClientSession, StdioServerParameters
from mcp import ClientSession
from mcp import StdioServerParameters
from mcp.client.sse import sse_client
from mcp.client.stdio import stdio_client
except ImportError as e:
@@ -36,7 +41,7 @@ except ImportError as e:
else:
raise e
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
class SseServerParams(BaseModel):
+3 -2
View File
@@ -18,9 +18,10 @@ import logging
import os
import signal
import sys
from typing import List, Union
from typing import List
from typing import Optional
from typing import TextIO
from typing import Union
from typing_extensions import override
@@ -51,7 +52,7 @@ except ImportError as e:
from .mcp_tool import MCPTool
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
class MCPToolset(BaseToolset):
@@ -33,7 +33,7 @@ from ...base_toolset import ToolPredicate
from .openapi_spec_parser import OpenApiSpecParser
from .rest_api_tool import RestApiTool
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
class OpenAPIToolset(BaseToolset):
@@ -30,7 +30,7 @@ from ..auth.credential_exchangers.auto_auth_credential_exchanger import AutoAuth
from ..auth.credential_exchangers.base_credential_exchanger import AuthCredentialMissingError
from ..auth.credential_exchangers.base_credential_exchanger import BaseAuthCredentialExchanger
logger = logging.getLogger(__name__)
logger = logging.getLogger("google_adk." + __name__)
AuthPreparationState = Literal["pending", "done"]
+1 -1
View File
@@ -29,7 +29,7 @@ try:
except ImportError:
import logging
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
logger.debug(
'The Vertex sdk is not installed. If you want to use the Vertex RAG with'
' agents, please install it. If not, you can ignore this warning.'
@@ -30,7 +30,7 @@ from .base_retrieval_tool import BaseRetrievalTool
if TYPE_CHECKING:
from ...models.llm_request import LlmRequest
logger = logging.getLogger(__name__)
logger = logging.getLogger('google_adk.' + __name__)
class VertexAiRagRetrieval(BaseRetrievalTool):