pygpt-net 2.6.29__py3-none-any.whl → 2.6.31__py3-none-any.whl

pygpt_net/provider/{gpt → api/openai}/chat.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.02 20:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 import json
@@ -16,7 +16,11 @@ from typing import Optional, Dict, Any, List
 from pygpt_net.core.types import (
     MODE_CHAT,
     MODE_VISION,
-    MODE_AUDIO, MULTIMODAL_IMAGE, MODE_RESEARCH, MODE_COMPLETION, OPENAI_DISABLE_TOOLS,
+    MODE_AUDIO,
+    MULTIMODAL_IMAGE,
+    MODE_RESEARCH,
+    MODE_COMPLETION,
+    OPENAI_DISABLE_TOOLS,
 )
 from pygpt_net.core.bridge.context import BridgeContext, MultimodalContext
 from pygpt_net.item.ctx import CtxItem
@@ -66,7 +70,7 @@ class Chat:
         user_name = ctx.input_name  # from ctx
         ai_name = ctx.output_name  # from ctx
 
-        client = self.window.core.gpt.get_client(mode, context.model)
+        client = self.window.core.api.openai.get_client(mode, context.model)
 
         # build chat messages
         messages = self.build(
@@ -94,7 +98,7 @@ class Chat:
         response_kwargs = {}
 
         # tools / functions
-        tools = self.window.core.gpt.tools.prepare(model, functions)
+        tools = self.window.core.api.openai.tools.prepare(model, functions)
 
         # fix: o1 compatibility
         if (model.id is not None
@@ -138,6 +142,9 @@ class Chat:
                 "format": "wav"
             }
 
+        if stream:
+            response_kwargs['stream_options'] = {"include_usage": True}
+
         response = client.chat.completions.create(
             messages=messages,
             model=model.id,
@@ -188,7 +195,7 @@ class Chat:
         max_ctx_tokens = self.window.core.config.get('max_total_tokens')  # max context window
 
         # fit to max model tokens
-        if max_ctx_tokens > model.ctx and model.ctx > 0:
+        if max_ctx_tokens > model.ctx > 0:
             max_ctx_tokens = model.ctx
 
         # input tokens: reset
@@ -319,12 +326,12 @@ class Chat:
         if not is_tool_output:  # append current prompt only if not tool output
             content = str(prompt)
             if model.is_image_input():
-                content = self.window.core.gpt.vision.build_content(
+                content = self.window.core.api.openai.vision.build_content(
                     content=content,
                     attachments=attachments,
                 )
             if model.is_audio_input():
-                content = self.window.core.gpt.audio.build_content(
+                content = self.window.core.api.openai.audio.build_content(
                     content=content,
                     multimodal_ctx=multimodal_ctx,
                 )
@@ -367,7 +374,7 @@ class Chat:
             output = response.choices[0].text.strip()
         elif mode in [
             MODE_CHAT,
-            MODE_VISION,
+            # MODE_VISION,
             MODE_RESEARCH,
         ]:
             if response.choices[0]:

pygpt_net/provider/{gpt → api/openai}/completion.py

@@ -76,7 +76,7 @@ class Completion:
         if user_name is not None and user_name != '':
             stop = [user_name + ':']
 
-        client = self.window.core.gpt.get_client()
+        client = self.window.core.api.openai.get_client()
 
         # fix for deprecated OpenAI davinci models
         if model_id.startswith('text-davinci'):

pygpt_net/provider/{gpt → api/openai}/image.py

@@ -74,7 +74,7 @@ class Image:
         # worker
         self.worker = ImageWorker()
         self.worker.window = self.window
-        self.worker.client = self.window.core.gpt.get_client()
+        self.worker.client = self.window.core.api.openai.get_client()
         self.worker.ctx = ctx
         self.worker.mode = sub_mode  # mode can be "generate" or "edit"
         self.worker.attachments = attachments  # attachments for edit mode

pygpt_net/provider/api/openai/realtime/__init__.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.08.31 23:00:00                  #
+# ================================================== #
+
+from .realtime import Realtime