From 153dca9d8f17f6af40cef623e968454b2500590b Mon Sep 17 00:00:00 2001 From: ferdzo Date: Mon, 3 Nov 2025 20:51:46 +0100 Subject: [PATCH] Small changes --- services/db_write/src/db_writer.py | 2 -- services/device_manager/app/app.py | 1 - services/gpt_service/.env.sample | 8 ++++---- services/gpt_service/gpt_service.py | 6 ++---- services/gpt_service/pyproject.toml | 5 ++++- uv.lock | 16 ++++++++++++++++ 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/services/db_write/src/db_writer.py b/services/db_write/src/db_writer.py index fada906..5e5852f 100644 --- a/services/db_write/src/db_writer.py +++ b/services/db_write/src/db_writer.py @@ -38,7 +38,6 @@ class DatabaseWriter: session = self.SessionLocal() try: - # Convert dataclass readings to SQLAlchemy Telemetry objects db_objects = [ Telemetry( time=reading.time, @@ -50,7 +49,6 @@ class DatabaseWriter: for reading in readings ] - # Bulk insert session.bulk_save_objects(db_objects) session.commit() diff --git a/services/device_manager/app/app.py b/services/device_manager/app/app.py index 154a173..bfe98f8 100644 --- a/services/device_manager/app/app.py +++ b/services/device_manager/app/app.py @@ -228,7 +228,6 @@ async def renew_certificate(device_id: str): db.query(DeviceCertificate) .filter( DeviceCertificate.device_id == device_id, - # DeviceCertificate.revoked_at.is_(None) ) .first() ) diff --git a/services/gpt_service/.env.sample b/services/gpt_service/.env.sample index 2e1a3db..a6ef261 100644 --- a/services/gpt_service/.env.sample +++ b/services/gpt_service/.env.sample @@ -1,6 +1,6 @@ -API_KEY = -PROVIDER_NAME = os.getenv("PROVIDER_NAME", "openai") -MODEL_NAME = os.getenv("MODEL_NAME", "gpt-4.1") -# HOST_URL = os.getenv("MODEL_URL") +API_KEY=your_api_key_here +PROVIDER_NAME=openai +MODEL_NAME=gpt-4.1 +HOST_URL= http://localhost:8000 LOG_LEVEL=INFO diff --git a/services/gpt_service/gpt_service.py b/services/gpt_service/gpt_service.py index ce891c4..a776402 100644 --- a/services/gpt_service/gpt_service.py +++ b/services/gpt_service/gpt_service.py @@ -1,4 +1,4 @@ -import openai +from openai import OpenAI from config import API_KEY, MODEL_NAME, PROVIDER_NAME, HOST_URL, LOG_LEVEL import logging @@ -14,9 +14,7 @@ class GPTService: self.logger = logging.getLogger(__name__) if self.provider_name == "openai": - openai.api_key = self.api_key - if self.host_url: - openai.api_base = self.host_url + self.client = OpenAI(api_key=self.api_key) self.logger.info(f"Initialized OpenAI GPTService with model {self.model_name}") else: self.logger.error(f"Unsupported provider: {self.provider_name}") diff --git a/services/gpt_service/pyproject.toml b/services/gpt_service/pyproject.toml index 5bb52f8..465b17e 100644 --- a/services/gpt_service/pyproject.toml +++ b/services/gpt_service/pyproject.toml @@ -4,4 +4,7 @@ version = "0.1.0" description = "Add your description here" readme = "README.md" requires-python = ">=3.13" -dependencies = [] +dependencies = [ + "openai>=2.6.1", + "python-dotenv>=1.2.1", +] diff --git a/uv.lock b/uv.lock index 40655b8..70c979c 100644 --- a/uv.lock +++ b/uv.lock @@ -6,6 +6,7 @@ requires-python = ">=3.13" members = [ "dashboard", "db-migrations", + "gpt-service", "iotdashboard", ] @@ -156,6 +157,21 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/8f/ef/81f3372b5dd35d8d354321155d1a38894b2b766f576d0abffac4d8ae78d9/django-5.2.7-py3-none-any.whl", hash = "sha256:59a13a6515f787dec9d97a0438cd2efac78c8aca1c80025244b0fe507fe0754b", size = 8307145, upload-time = "2025-10-01T14:22:49.476Z" }, ] +[[package]] +name = "gpt-service" +version = "0.1.0" +source = { virtual = "services/gpt_service" } +dependencies = [ + { name = "openai" }, + { name = "python-dotenv" }, +] + +[package.metadata] +requires-dist = [ + { name = "openai", specifier = ">=2.6.1" }, + { name = "python-dotenv", specifier = ">=1.2.1" }, +] + [[package]] name = "greenlet" version = "3.2.4"