23
23
remote_provider_spec ,
24
24
)
25
25
26
- logger = get_logger (name = __name__ , category = "core" )
26
+ log = get_logger (name = __name__ , category = "core" )
27
27
28
28
29
29
def stack_apis () -> list [Api ]:
@@ -141,18 +141,18 @@ def get_provider_registry(config=None) -> dict[Api, dict[str, ProviderSpec]]:
141
141
registry : dict [Api , dict [str , ProviderSpec ]] = {}
142
142
for api in providable_apis ():
143
143
name = api .name .lower ()
144
- logger .debug (f"Importing module { name } " )
144
+ log .debug (f"Importing module { name } " )
145
145
try :
146
146
module = importlib .import_module (f"llama_stack.providers.registry.{ name } " )
147
147
registry [api ] = {a .provider_type : a for a in module .available_providers ()}
148
148
except ImportError as e :
149
- logger .warning (f"Failed to import module { name } : { e } " )
149
+ log .warning (f"Failed to import module { name } : { e } " )
150
150
151
151
# Refresh providable APIs with external APIs if any
152
152
external_apis = load_external_apis (config )
153
153
for api , api_spec in external_apis .items ():
154
154
name = api_spec .name .lower ()
155
- logger .info (f"Importing external API { name } module { api_spec .module } " )
155
+ log .info (f"Importing external API { name } module { api_spec .module } " )
156
156
try :
157
157
module = importlib .import_module (api_spec .module )
158
158
registry [api ] = {a .provider_type : a for a in module .available_providers ()}
@@ -161,7 +161,7 @@ def get_provider_registry(config=None) -> dict[Api, dict[str, ProviderSpec]]:
161
161
# This assume that the in-tree provider(s) are not available for this API which means
162
162
# that users will need to use external providers for this API.
163
163
registry [api ] = {}
164
- logger .error (
164
+ log .error (
165
165
f"Failed to import external API { name } : { e } . Could not populate the in-tree provider(s) registry for { api .name } . \n "
166
166
"Install the API package to load any in-tree providers for this API."
167
167
)
@@ -183,13 +183,13 @@ def get_provider_registry(config=None) -> dict[Api, dict[str, ProviderSpec]]:
183
183
def get_external_providers_from_dir (
184
184
registry : dict [Api , dict [str , ProviderSpec ]], config
185
185
) -> dict [Api , dict [str , ProviderSpec ]]:
186
- logger .warning (
186
+ log .warning (
187
187
"Specifying external providers via `external_providers_dir` is being deprecated. Please specify `module:` in the provider instead."
188
188
)
189
189
external_providers_dir = os .path .abspath (os .path .expanduser (config .external_providers_dir ))
190
190
if not os .path .exists (external_providers_dir ):
191
191
raise FileNotFoundError (f"External providers directory not found: { external_providers_dir } " )
192
- logger .info (f"Loading external providers from { external_providers_dir } " )
192
+ log .info (f"Loading external providers from { external_providers_dir } " )
193
193
194
194
for api in providable_apis ():
195
195
api_name = api .name .lower ()
@@ -198,13 +198,13 @@ def get_external_providers_from_dir(
198
198
for provider_type in ["remote" , "inline" ]:
199
199
api_dir = os .path .join (external_providers_dir , provider_type , api_name )
200
200
if not os .path .exists (api_dir ):
201
- logger .debug (f"No { provider_type } provider directory found for { api_name } " )
201
+ log .debug (f"No { provider_type } provider directory found for { api_name } " )
202
202
continue
203
203
204
204
# Look for provider spec files in the API directory
205
205
for spec_path in glob .glob (os .path .join (api_dir , "*.yaml" )):
206
206
provider_name = os .path .splitext (os .path .basename (spec_path ))[0 ]
207
- logger .info (f"Loading { provider_type } provider spec from { spec_path } " )
207
+ log .info (f"Loading { provider_type } provider spec from { spec_path } " )
208
208
209
209
try :
210
210
with open (spec_path ) as f :
@@ -217,16 +217,16 @@ def get_external_providers_from_dir(
217
217
spec = _load_inline_provider_spec (spec_data , api , provider_name )
218
218
provider_type_key = f"inline::{ provider_name } "
219
219
220
- logger .info (f"Loaded { provider_type } provider spec for { provider_type_key } from { spec_path } " )
220
+ log .info (f"Loaded { provider_type } provider spec for { provider_type_key } from { spec_path } " )
221
221
if provider_type_key in registry [api ]:
222
- logger .warning (f"Overriding already registered provider { provider_type_key } for { api .name } " )
222
+ log .warning (f"Overriding already registered provider { provider_type_key } for { api .name } " )
223
223
registry [api ][provider_type_key ] = spec
224
- logger .info (f"Successfully loaded external provider { provider_type_key } " )
224
+ log .info (f"Successfully loaded external provider { provider_type_key } " )
225
225
except yaml .YAMLError as yaml_err :
226
- logger .error (f"Failed to parse YAML file { spec_path } : { yaml_err } " )
226
+ log .error (f"Failed to parse YAML file { spec_path } : { yaml_err } " )
227
227
raise yaml_err
228
228
except Exception as e :
229
- logger .error (f"Failed to load provider spec from { spec_path } : { e } " )
229
+ log .error (f"Failed to load provider spec from { spec_path } : { e } " )
230
230
raise e
231
231
232
232
return registry
@@ -241,7 +241,7 @@ def get_external_providers_from_module(
241
241
else :
242
242
provider_list = config .providers .items ()
243
243
if provider_list is None :
244
- logger .warning ("Could not get list of providers from config" )
244
+ log .warning ("Could not get list of providers from config" )
245
245
return registry
246
246
for provider_api , providers in provider_list :
247
247
for provider in providers :
@@ -272,6 +272,6 @@ def get_external_providers_from_module(
272
272
"get_provider_spec not found. If specifying an external provider via `module` in the Provider spec, the Provider must have the `provider.get_provider_spec` module available"
273
273
) from exc
274
274
except Exception as e :
275
- logger .error (f"Failed to load provider spec from module { provider .module } : { e } " )
275
+ log .error (f"Failed to load provider spec from module { provider .module } : { e } " )
276
276
raise e
277
277
return registry
0 commit comments