Skip to content

Commit afd1409

Browse files
authored
Merge pull request #26 from stacklok/fix-deprecation-errors
Update python-jsonlogger imports and pytest asyncio config
2 parents 5858d12 + 1f5f189 commit afd1409

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pytest.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[pytest]
2+
asyncio_default_fixture_loop_scope = function

src/mockllm/config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
import yaml
88
from fastapi import HTTPException
9-
from pythonjsonlogger import jsonlogger
9+
from pythonjsonlogger.json import JsonFormatter
1010

1111
log_handler = logging.StreamHandler()
12-
log_handler.setFormatter(jsonlogger.JsonFormatter())
12+
log_handler.setFormatter(JsonFormatter())
1313
logging.basicConfig(level=logging.INFO, handlers=[log_handler])
1414
logger = logging.getLogger(__name__)
1515

@@ -53,7 +53,7 @@ def load_responses(self) -> None:
5353
def get_response(self, prompt: str) -> str:
5454
"""Get response for a given prompt."""
5555
self.load_responses() # Check for updates
56-
return self.responses.get(prompt , self.default_response)
56+
return self.responses.get(prompt, self.default_response)
5757

5858
def get_streaming_response(
5959
self, prompt: str, chunk_size: Optional[int] = None

src/mockllm/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import tiktoken
55
from fastapi import FastAPI, HTTPException
66
from fastapi.responses import StreamingResponse
7-
from pythonjsonlogger import jsonlogger
7+
from pythonjsonlogger.json import JsonFormatter
88

99
from .config import ResponseConfig
1010
from .models import (
@@ -20,7 +20,7 @@
2020
from .providers.openai import OpenAIProvider
2121

2222
log_handler = logging.StreamHandler()
23-
log_handler.setFormatter(jsonlogger.JsonFormatter())
23+
log_handler.setFormatter(JsonFormatter())
2424
logging.basicConfig(level=logging.INFO, handlers=[log_handler])
2525
logger = logging.getLogger(__name__)
2626

0 commit comments

Comments
 (0)