22
33import logging
44from abc import ABC
5- from typing import TYPE_CHECKING , TypeVar , Union
5+ from typing import TYPE_CHECKING
66
77from pydantic import Field , field_validator
88
99from semantic_kernel .connectors .ai .prompt_execution_settings import PromptExecutionSettings
10- from semantic_kernel .exceptions import (
11- KernelFunctionAlreadyExistsError ,
12- KernelServiceNotFoundError ,
13- ServiceInvalidTypeError ,
14- )
15- from semantic_kernel .functions .kernel_arguments import KernelArguments
10+ from semantic_kernel .const import DEFAULT_SERVICE_NAME
11+ from semantic_kernel .exceptions import KernelFunctionAlreadyExistsError , KernelServiceNotFoundError
1612from semantic_kernel .kernel_pydantic import KernelBaseModel
13+ from semantic_kernel .kernel_types import AI_SERVICE_CLIENT_TYPE
1714from semantic_kernel .services .ai_service_client_base import AIServiceClientBase
1815from semantic_kernel .services .ai_service_selector import AIServiceSelector
1916
2017if TYPE_CHECKING :
21- from semantic_kernel .connectors .ai .chat_completion_client_base import ChatCompletionClientBase
22- from semantic_kernel .connectors .ai .embeddings .embedding_generator_base import EmbeddingGeneratorBase
23- from semantic_kernel .connectors .ai .text_completion_client_base import TextCompletionClientBase
18+ from semantic_kernel .functions .kernel_arguments import KernelArguments
2419 from semantic_kernel .functions .kernel_function import KernelFunction
2520
26- T = TypeVar ("T" )
27-
28- AI_SERVICE_CLIENT_TYPE = TypeVar ("AI_SERVICE_CLIENT_TYPE" , bound = AIServiceClientBase )
29- ALL_SERVICE_TYPES = Union ["TextCompletionClientBase" , "ChatCompletionClientBase" , "EmbeddingGeneratorBase" ]
30-
3121
3222logger : logging .Logger = logging .getLogger (__name__ )
3323
@@ -48,69 +38,70 @@ def rewrite_services(
4838 if not services :
4939 return {}
5040 if isinstance (services , AIServiceClientBase ):
51- return {services .service_id if services .service_id else "default" : services } # type: ignore
41+ return {services .service_id if services .service_id else DEFAULT_SERVICE_NAME : services } # type: ignore
5242 if isinstance (services , list ):
53- return {s .service_id if s .service_id else "default" : s for s in services }
43+ return {s .service_id if s .service_id else DEFAULT_SERVICE_NAME : s for s in services }
5444 return services
5545
5646 def select_ai_service (
57- self , function : "KernelFunction" , arguments : KernelArguments
58- ) -> tuple [ALL_SERVICE_TYPES , PromptExecutionSettings ]:
47+ self , function : "KernelFunction" , arguments : " KernelArguments"
48+ ) -> tuple [AIServiceClientBase , PromptExecutionSettings ]:
5949 """Uses the AI service selector to select a service for the function."""
6050 return self .ai_service_selector .select_ai_service (self , function , arguments )
6151
6252 def get_service (
6353 self ,
6454 service_id : str | None = None ,
65- type : type [ALL_SERVICE_TYPES ] | None = None ,
66- ) -> " AIServiceClientBase"
55+ type : type [AI_SERVICE_CLIENT_TYPE ] | tuple [ type [ AI_SERVICE_CLIENT_TYPE ], ... ] | None = None ,
56+ ) -> AIServiceClientBase :
6757 """Get a service by service_id and type.
6858
6959 Type is optional and when not supplied, no checks are done.
7060 Type should be
7161 TextCompletionClientBase, ChatCompletionClientBase, EmbeddingGeneratorBase
7262 or a subclass of one.
7363 You can also check for multiple types in one go,
74- by using TextCompletionClientBase | ChatCompletionClientBase.
64+ by using a tuple: (TextCompletionClientBase, ChatCompletionClientBase) .
7565
7666 If type and service_id are both None, the first service is returned.
7767
7868 Args:
7969 service_id (str | None): The service id,
8070 if None, the default service is returned or the first service is returned.
81- type (Type[ALL_SERVICE_TYPES] | None): The type of the service, if None, no checks are done.
71+ type (Type[AI_SERVICE_CLIENT_TYPE] | tuple[type[AI_SERVICE_CLIENT_TYPE], ...] | None):
72+ The type of the service, if None, no checks are done on service type.
8273
8374 Returns:
84- ALL_SERVICE_TYPES : The service.
75+ AIServiceClientBase : The service, should be a class derived from AIServiceClientBase .
8576
8677 Raises:
87- ValueError : If no service is found that matches the type.
78+ KernelServiceNotFoundError : If no service is found that matches the type or id .
8879
8980 """
90- service : "AIServiceClientBase | None" = None
91- if not service_id or service_id == "default" :
92- if not type :
93- if default_service := self .services .get ("default" ):
94- return default_service
95- return next (iter (self .services .values ()))
96- if (default_service := self .services .get ("default" )) and isinstance (default_service , type ):
97- return default_service
98- for service in self .services .values ():
99- if isinstance (service , type ):
100- return service
101- raise KernelServiceNotFoundError (f"No service found of type { type } )
102- if not (service := self .services .get (service_id )):
103- raise KernelServiceNotFoundError (f"Service with service_id '{ service_id } )
104- if type and not isinstance (service , type ):
105- raise ServiceInvalidTypeError (f"Service with service_id '{ service_id } { type } )
106- return service
107-
108- def get_services_by_type (self , type : type [ALL_SERVICE_TYPES ]) -> dict [str , ALL_SERVICE_TYPES ]:
81+ services = self .get_services_by_type (type )
82+ if not services :
83+ raise KernelServiceNotFoundError (f"No services found of type { type } )
84+ if not service_id :
85+ service_id = DEFAULT_SERVICE_NAME
86+
87+ if service_id not in services :
88+ if service_id == DEFAULT_SERVICE_NAME :
89+ return next (iter (services .values ()))
90+ raise KernelServiceNotFoundError (
91+ f"Service with service_id '{ service_id }
92+ )
93+ return services [service_id ]
94+
95+ def get_services_by_type (
96+ self , type : type [AI_SERVICE_CLIENT_TYPE ] | tuple [type [AI_SERVICE_CLIENT_TYPE ], ...] | None
97+ ) -> dict [str , AIServiceClientBase ]:
10998 """Get all services of a specific type."""
110- return {service .service_id : service for service in self .services .values () if isinstance (service , type )} # type: ignore
99+ if type is None :
100+ return self .services
101+ return {service .service_id : service for service in self .services .values () if isinstance (service , type )}
111102
112103 def get_prompt_execution_settings_from_service_id (
113- self , service_id : str , type : type [ALL_SERVICE_TYPES ] | None = None
104+ self , service_id : str , type : type [AI_SERVICE_CLIENT_TYPE ] | None = None
114105 ) -> PromptExecutionSettings :
115106 """Get the specific request settings from the service, instantiated with the service_id and ai_model_id."""
116107 service = self .get_service (service_id , type = type )
@@ -128,8 +119,8 @@ def add_service(self, service: AIServiceClientBase, overwrite: bool = False) ->
128119 """
129120 if service .service_id not in self .services or overwrite :
130121 self .services [service .service_id ] = service
131- else :
132- raise KernelFunctionAlreadyExistsError (f"Service with service_id '{ service .service_id } )
122+ return
123+ raise KernelFunctionAlreadyExistsError (f"Service with service_id '{ service .service_id } )
133124
134125 def remove_service (self , service_id : str ) -> None :
135126 """Delete a single service from the Kernel."""
0 commit comments