feat(borads): 优化mp下连接Ollama平台时的服务器地址配置

This commit is contained in:
王立帮
2025-05-25 15:59:37 +08:00
parent defeeb3bd1
commit a94726ea08
8 changed files with 10 additions and 8 deletions

View File

@@ -12,6 +12,7 @@ class Ollama():
"Content-Type": "application/json" "Content-Type": "application/json"
} }
self._url = url self._url = url
self._chat_url = "{}/api/chat".format(self._url)
self._max_retries = 1 self._max_retries = 1
self._max_history_num = max_history_num self._max_history_num = max_history_num
self._timeout = 10000 self._timeout = 10000
@@ -30,6 +31,7 @@ class Ollama():
def set_custom_url(self, url): def set_custom_url(self, url):
self._url = url self._url = url
self._chat_url = "{}/api/chat".format(self._url)
def select_model(self, model_name): def select_model(self, model_name):
self._data["model"] = model_name self._data["model"] = model_name
@@ -57,7 +59,7 @@ class Ollama():
data = json.dumps(self._data).encode('utf-8') data = json.dumps(self._data).encode('utf-8')
for i in range(0, self._max_retries): for i in range(0, self._max_retries):
response = urequests.post( response = urequests.post(
self._url, headers=self._heads, data=data) self._chat_url, headers=self._heads, data=data)
if response.status_code == 200: if response.status_code == 200:
break break
time.sleep(1) time.sleep(1)

View File

@@ -7244,7 +7244,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -7111,7 +7111,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -7003,7 +7003,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -6917,7 +6917,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -6647,7 +6647,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -7389,7 +7389,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">

View File

@@ -5678,7 +5678,7 @@
<block type="iot_connect_ollama"> <block type="iot_connect_ollama">
<value name="SERVER"> <value name="SERVER">
<shadow type="text"> <shadow type="text">
<field name="TEXT">192.168.1.1</field> <field name="TEXT">http://192.168.1.1</field>
</shadow> </shadow>
</value> </value>
<value name="NAME"> <value name="NAME">