administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-03-10 02:29:19 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Various Fixes (#22263)
Some checks are pending
CI / AMD64 Build (push) Waiting to run
Details
CI / ARM Build (push) Waiting to run
Details
CI / Jetson Jetpack 6 (push) Waiting to run
Details
CI / AMD64 Extra Build (push) Blocked by required conditions
Details
CI / ARM Extra Build (push) Blocked by required conditions
Details
CI / Synaptics Build (push) Blocked by required conditions
Details
CI / Assemble and push default build (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Nicolas Mowen 2026-03-04 15:53:20 -07:00 committed by GitHub
parent 95956a690b
commit b2118382cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frigate/camera/activity_manager.py
View File

@ -236,6 +236,7 @@ class AudioActivityManager:
None, None,
"audio", "audio",
{}, {},
None,
), ),
EventMetadataTypeEnum.manual_event_create.value, EventMetadataTypeEnum.manual_event_create.value,
) )

39
frigate/genai/ollama.py
View File

@ -222,27 +222,24 @@ class OllamaClient(GenAIClient):
) )
content_parts: list[str] = [] content_parts: list[str] = []
final_message: dict[str, Any] | None = None final_message: dict[str, Any] | None = None
try: stream = await async_client.chat(**request_params)
stream = await async_client.chat(**request_params) async for chunk in stream:
async for chunk in stream: if not chunk or "message" not in chunk:
if not chunk or "message" not in chunk: continue
continue msg = chunk.get("message", {})
msg = chunk.get("message", {}) delta = msg.get("content") or ""
delta = msg.get("content") or "" if delta:
if delta: content_parts.append(delta)
content_parts.append(delta) yield ("content_delta", delta)
yield ("content_delta", delta) if chunk.get("done"):
if chunk.get("done"): full_content = "".join(content_parts).strip() or None
full_content = "".join(content_parts).strip() or None tool_calls = parse_tool_calls_from_message(msg)
tool_calls = parse_tool_calls_from_message(msg) final_message = {
final_message = { "content": full_content,
"content": full_content, "tool_calls": tool_calls,
"tool_calls": tool_calls, "finish_reason": "tool_calls" if tool_calls else "stop",
"finish_reason": "tool_calls" if tool_calls else "stop", }
} break
break
finally:
await async_client.close()
if final_message is not None: if final_message is not None:
yield ("message", final_message) yield ("message", final_message)