v3.12.1

- Possibility to force-disable streaming when callbacks was provided (openai, anthropic API)
- Fix tests when .env file is present

Makefile

@@ -11,6 +11,8 @@ init:
 	docker-compose up -d --build && $(DEXEC) bash
 sh:
 	$(DEXEC) bash
+start:
+	docker-compose start
 stop:
 	docker-compose stop
 cs:

microcore/__init__.py

@@ -150,4 +150,4 @@ def has_content(self, collection: str) -> bool:
     # "wrappers",
 ]
 
-__version__ = "3.12.0"
+__version__ = "3.12.1"

microcore/llm/_openai_llm_v0.py

@@ -73,7 +73,8 @@ def _prepare_llm_arguments(config: Config, kwargs: dict):
         cb = args.pop("callback")
         if cb:
             callbacks.append(cb)
-    args["stream"] = bool(callbacks)
+    if "stream" not in args:
+        args["stream"] = bool(callbacks)
     return args, {"callbacks": callbacks}
 
 
@@ -92,7 +93,10 @@ async def allm(prompt, **kwargs):
                 )
 
             for cb in options["callbacks"]:
-                cb(response.choices[0].message.content)
+                if asyncio.iscoroutinefunction(cb):
+                    await cb(response.choices[0].message.content)
+                else:
+                    cb(response.choices[0].message.content)
             return LLMResponse(response.choices[0].message.content, response)
 
         response = await openai.Completion.acreate(

microcore/llm/_openai_llm_v1.py

@@ -63,7 +63,8 @@ def _prepare_llm_arguments(config: Config, kwargs: dict):
         cb = args.pop("callback")
         if cb:
             callbacks.append(cb)
-    args["stream"] = bool(callbacks)
+    if "stream" not in args:
+        args["stream"] = bool(callbacks)
     return args, {"callbacks": callbacks}
 
 
@@ -107,7 +108,10 @@ async def allm(prompt, **kwargs):
                 )
 
             for cb in options["callbacks"]:
-                cb(response.choices[0].message.content)
+                if asyncio.iscoroutinefunction(cb):
+                    await cb(response.choices[0].message.content)
+                else:
+                    cb(response.choices[0].message.content)
             return LLMResponse(response.choices[0].message.content, response.__dict__)
 
         response = await _async_connection.completions.create(

microcore/llm/anthropic.py

@@ -44,7 +44,8 @@ def _prepare_llm_arguments(config: Config, kwargs: dict):
         cb = args.pop("callback")
         if cb:
             callbacks.append(cb)
-    args["stream"] = bool(callbacks)
+    if "stream" not in args:
+        args["stream"] = bool(callbacks)
     return args, {"callbacks": callbacks}
 
 
@@ -105,7 +106,10 @@ async def allm(prompt, **kwargs):
             return await _a_process_streamed_response(response, options["callbacks"])
 
         for cb in options["callbacks"]:
-            cb(response.content[0].text)
+            if asyncio.iscoroutinefunction(cb):
+                await cb(response.content[0].text)
+            else:
+                cb(response.content[0].text)
         return LLMResponse(response.content[0].text, response.__dict__)
 
     def llm(prompt, **kwargs):

tests/basic/test_config.py

@@ -6,6 +6,9 @@
 
 
 def test_config(monkeypatch):
+    # avoid using .env file
+    monkeypatch.setenv("USE_DOT_ENV", "")
+
     monkeypatch.setenv("LLM_API_KEY", "123")
     monkeypatch.setenv("PROMPT_TEMPLATES_PATH", "mypath")
     assert Config().PROMPT_TEMPLATES_PATH == "mypath"

tests/basic/test_llm.py

@@ -16,3 +16,24 @@ async def test_llm_mocked_parrot(setup):
     assert mc.llm("ok", model="chat-llama") == "ok"
     assert await mc.allm("ok", model="gpt-4") == "ok"
     assert await mc.allm("ok", model="gpt-3.5-instruct") == "completion:ok"
+
+@pytest.mark.asyncio
+async def test_llm_no_streaming(setup):
+    t = ""
+    def fn(text):
+        nonlocal t
+        t += text
+
+    mc.llm("ok", model="gpt-4", stream=False, callback=fn)
+    assert t == "ok"
+
+    def afn(text):
+        nonlocal t
+        t += text
+    t = ""
+    mc.llm("ok2", model="gpt-4", stream=False, callback=afn)
+    assert t == "ok2"
+
+    t = ""
+    mc.llm("ok", model="gpt-4", stream=False, callbacks=[afn,fn])
+    assert t == "okok"