Spaces:
Paused
Paused
Update intent_api.py
Browse files- intent_api.py +12 -4
intent_api.py
CHANGED
@@ -2,6 +2,8 @@ import intent_utils as intent
|
|
2 |
import requests
|
3 |
import traceback
|
4 |
from log import log
|
|
|
|
|
5 |
|
6 |
def auth_token_handler(api_name, auth_config, session):
|
7 |
try:
|
@@ -85,7 +87,7 @@ def refresh_auth_token(api_name, auth_config, session):
|
|
85 |
log(f"❌ Token yenileme başarısız: {e}")
|
86 |
raise e
|
87 |
|
88 |
-
def execute_intent(intent_name, user_input, session_dict, intent_definitions, data_formats):
|
89 |
try:
|
90 |
session = session_dict
|
91 |
intent_def = intent_definitions[intent_name]
|
@@ -94,7 +96,13 @@ def execute_intent(intent_name, user_input, session_dict, intent_definitions, da
|
|
94 |
if not action_api_name:
|
95 |
raise Exception(f"Intent '{intent_name}' için action tanımı eksik.")
|
96 |
|
97 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
98 |
if not api_def:
|
99 |
raise Exception(f"API '{action_api_name}' tanımı bulunamadı.")
|
100 |
|
@@ -126,7 +134,7 @@ def execute_intent(intent_name, user_input, session_dict, intent_definitions, da
|
|
126 |
verify_path = tls.get("ca_bundle") if verify and tls.get("ca_bundle") else verify
|
127 |
|
128 |
if auth_config:
|
129 |
-
token, session = auth_token_handler(action_api_name, auth_config, session)
|
130 |
|
131 |
resolved_headers = {
|
132 |
h["key"]: intent.resolve_placeholders(h["value"], session, variables)
|
@@ -149,7 +157,7 @@ def execute_intent(intent_name, user_input, session_dict, intent_definitions, da
|
|
149 |
)
|
150 |
if response.status_code == 401 and auth_config and attempt < retry_count:
|
151 |
log("🔁 Token expired. Yenileniyor...")
|
152 |
-
token, session = refresh_auth_token(action_api_name, auth_config, session)
|
153 |
continue
|
154 |
response.raise_for_status()
|
155 |
break
|
|
|
2 |
import requests
|
3 |
import traceback
|
4 |
from log import log
|
5 |
+
from core import llm_models
|
6 |
+
import intent
|
7 |
|
8 |
def auth_token_handler(api_name, auth_config, session):
|
9 |
try:
|
|
|
87 |
log(f"❌ Token yenileme başarısız: {e}")
|
88 |
raise e
|
89 |
|
90 |
+
def execute_intent(intent_name, user_input, session_dict, intent_definitions, data_formats, project_name):
|
91 |
try:
|
92 |
session = session_dict
|
93 |
intent_def = intent_definitions[intent_name]
|
|
|
96 |
if not action_api_name:
|
97 |
raise Exception(f"Intent '{intent_name}' için action tanımı eksik.")
|
98 |
|
99 |
+
# 💡 Merkezi service_config kullanıyoruz
|
100 |
+
llm_model_instance = llm_models.get(project_name)
|
101 |
+
if not llm_model_instance:
|
102 |
+
raise Exception(f"'{project_name}' için llm_model instance bulunamadı.")
|
103 |
+
service_config = llm_model_instance.service_config
|
104 |
+
|
105 |
+
api_def = service_config.get_api_config(action_api_name)
|
106 |
if not api_def:
|
107 |
raise Exception(f"API '{action_api_name}' tanımı bulunamadı.")
|
108 |
|
|
|
134 |
verify_path = tls.get("ca_bundle") if verify and tls.get("ca_bundle") else verify
|
135 |
|
136 |
if auth_config:
|
137 |
+
token, session = intent.auth_token_handler(action_api_name, auth_config, session)
|
138 |
|
139 |
resolved_headers = {
|
140 |
h["key"]: intent.resolve_placeholders(h["value"], session, variables)
|
|
|
157 |
)
|
158 |
if response.status_code == 401 and auth_config and attempt < retry_count:
|
159 |
log("🔁 Token expired. Yenileniyor...")
|
160 |
+
token, session = intent.refresh_auth_token(action_api_name, auth_config, session)
|
161 |
continue
|
162 |
response.raise_for_status()
|
163 |
break
|