fix: llm session tweaks & agent init refactor
This commit is contained in:
@@ -55,7 +55,7 @@ class GeneraticAgent:
|
|||||||
self.lock = threading.Lock()
|
self.lock = threading.Lock()
|
||||||
self.history = []
|
self.history = []
|
||||||
self.task_queue = queue.Queue()
|
self.task_queue = queue.Queue()
|
||||||
self.is_running, self.stop_sig = False, False
|
self.is_running = False; self.stop_sig = False
|
||||||
self.llm_no = 0; self.inc_out = False
|
self.llm_no = 0; self.inc_out = False
|
||||||
self.handler = None; self.verbose = True
|
self.handler = None; self.verbose = True
|
||||||
self.llmclient = self.llmclients[self.llm_no]
|
self.llmclient = self.llmclients[self.llm_no]
|
||||||
@@ -141,7 +141,7 @@ if __name__ == '__main__':
|
|||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
agent = GeneraticAgent()
|
agent = GeneraticAgent()
|
||||||
agent.llm_no = args.llm_no
|
agent.next_llm(args.llm_no)
|
||||||
agent.verbose = False
|
agent.verbose = False
|
||||||
threading.Thread(target=agent.run, daemon=True).start()
|
threading.Thread(target=agent.run, daemon=True).start()
|
||||||
|
|
||||||
|
|||||||
@@ -234,7 +234,7 @@ class LLMSession:
|
|||||||
streamed_any = True
|
streamed_any = True
|
||||||
yield delta; buffer += delta
|
yield delta; buffer += delta
|
||||||
if finish_reason: break
|
if finish_reason: break
|
||||||
if '</tool_use>' in buffer[-30:]: break
|
#if '</tool_use>' in buffer[-30:]: break
|
||||||
return
|
return
|
||||||
except requests.HTTPError as e:
|
except requests.HTTPError as e:
|
||||||
resp = getattr(e, "response", None)
|
resp = getattr(e, "response", None)
|
||||||
@@ -331,7 +331,7 @@ class LLMSession:
|
|||||||
|
|
||||||
class GeminiSession:
|
class GeminiSession:
|
||||||
def __init__(self, cfg):
|
def __init__(self, cfg):
|
||||||
self.api_key = cfg.get('apikey') or google_api_key
|
self.api_key = cfg.get('apikey')
|
||||||
if not self.api_key: raise ValueError("google_api_key 未配置或为空,请在 mykey.py 中设置")
|
if not self.api_key: raise ValueError("google_api_key 未配置或为空,请在 mykey.py 中设置")
|
||||||
self.default_model = cfg.get('model', 'gemini-2.0-flash-001')
|
self.default_model = cfg.get('model', 'gemini-2.0-flash-001')
|
||||||
p = cfg.get('proxy', proxy)
|
p = cfg.get('proxy', proxy)
|
||||||
|
|||||||
Reference in New Issue
Block a user