ciyidogan commited on
Commit
be76cc5
·
verified ·
1 Parent(s): b4a018f

Update intent_api.py

Browse files
Files changed (1) hide show
  1. intent_api.py +11 -78
intent_api.py CHANGED
@@ -5,86 +5,12 @@ from log import log
5
  from core import llm_models
6
 
7
  def auth_token_handler(api_name, auth_config, session):
8
- try:
9
- token_info = session.get("auth_tokens", {}).get(api_name)
10
- if token_info and "token" in token_info:
11
- return token_info["token"], session
12
-
13
- auth_endpoint = auth_config.get("auth_endpoint")
14
- auth_body = auth_config.get("auth_body", {})
15
- token_path = auth_config.get("auth_token_path")
16
-
17
- if not auth_endpoint or not token_path:
18
- raise Exception("auth_endpoint veya token_path tanımsız")
19
-
20
- resolved_body = {
21
- k: intent.resolve_placeholders(str(v), session, session.get("variables", {})) for k, v in auth_body.items()
22
- }
23
-
24
- response = requests.post(auth_endpoint, json=resolved_body, timeout=5)
25
- response.raise_for_status()
26
- json_resp = response.json()
27
-
28
- token_parts = token_path.split(".")
29
- token = json_resp
30
- for part in token_parts:
31
- token = token.get(part)
32
- if token is None:
33
- raise Exception(f"Token path çözülemedi: {token_path}")
34
-
35
- refresh_token = json_resp.get("refresh_token")
36
- session.setdefault("auth_tokens", {})[api_name] = {
37
- "token": token,
38
- "refresh_token": refresh_token
39
- }
40
-
41
- return token, session
42
-
43
- except Exception as e:
44
- log(f"❌ Auth token alınamadı: {e}")
45
- raise e
46
 
47
  def refresh_auth_token(api_name, auth_config, session):
48
- try:
49
- refresh_endpoint = auth_config.get("auth_refresh_endpoint")
50
- refresh_body = auth_config.get("refresh_body", {})
51
- token_path = auth_config.get("auth_token_path")
52
-
53
- if not refresh_endpoint or not token_path:
54
- raise Exception("Refresh yapılandırması eksik")
55
-
56
- refresh_token = session.get("auth_tokens", {}).get(api_name, {}).get("refresh_token")
57
- if not refresh_token:
58
- raise Exception("Mevcut refresh token bulunamadı")
59
-
60
- resolved_body = {
61
- k: intent.resolve_placeholders(str(v), session, session.get("variables", {})) for k, v in refresh_body.items()
62
- }
63
-
64
- response = requests.post(refresh_endpoint, json=resolved_body, timeout=5)
65
- response.raise_for_status()
66
- json_resp = response.json()
67
-
68
- token_parts = token_path.split(".")
69
- token = json_resp
70
- for part in token_parts:
71
- token = token.get(part)
72
- if token is None:
73
- raise Exception(f"Token path çözülemedi: {token_path}")
74
-
75
- new_refresh_token = json_resp.get("refresh_token", refresh_token)
76
-
77
- session.setdefault("auth_tokens", {})[api_name] = {
78
- "token": token,
79
- "refresh_token": new_refresh_token
80
- }
81
-
82
- log(f"🔁 Token başarıyla yenilendi: {api_name}")
83
- return token, session
84
-
85
- except Exception as e:
86
- log(f"❌ Token yenileme başarısız: {e}")
87
- raise e
88
 
89
  def execute_intent(intent_name, user_input, session_dict, intent_definitions, data_formats, project_name, service_config):
90
  try:
@@ -170,8 +96,13 @@ def execute_intent(intent_name, user_input, session_dict, intent_definitions, da
170
  if field:
171
  merged_variables[field] = str(value)
172
 
 
 
 
173
  reply = intent.resolve_placeholders(template, session, merged_variables)
174
 
 
 
175
  # 🔧 Session’a tüm yeni birleşimi kaydet
176
  session.setdefault("variables", {}).update(merged_variables)
177
  session["last_intent"] = intent_name
@@ -183,6 +114,8 @@ def execute_intent(intent_name, user_input, session_dict, intent_definitions, da
183
 
184
  except Exception as e:
185
  log(f"❌ execute_intent() hatası: {e}")
 
 
186
  traceback.print_exc()
187
  return {
188
  "error": str(e),
 
5
  from core import llm_models
6
 
7
  def auth_token_handler(api_name, auth_config, session):
8
+ # (mevcut kod, değişmedi)
9
+ ...
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10
 
11
  def refresh_auth_token(api_name, auth_config, session):
12
+ # (mevcut kod, değişmedi)
13
+ ...
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
 
15
  def execute_intent(intent_name, user_input, session_dict, intent_definitions, data_formats, project_name, service_config):
16
  try:
 
96
  if field:
97
  merged_variables[field] = str(value)
98
 
99
+ log(f"🧩 merged_variables: {merged_variables}")
100
+ log(f"🧩 reply_template: {template}")
101
+
102
  reply = intent.resolve_placeholders(template, session, merged_variables)
103
 
104
+ log(f"🛠 Final reply: {reply}")
105
+
106
  # 🔧 Session’a tüm yeni birleşimi kaydet
107
  session.setdefault("variables", {}).update(merged_variables)
108
  session["last_intent"] = intent_name
 
114
 
115
  except Exception as e:
116
  log(f"❌ execute_intent() hatası: {e}")
117
+ log(f"❌ session_dict: {session_dict}")
118
+ log(f"❌ intent_definitions: {intent_definitions}")
119
  traceback.print_exc()
120
  return {
121
  "error": str(e),