pygpt-net 2.6.33__py3-none-any.whl → 2.6.36__py3-none-any.whl

pygpt_net/core/render/web/pid.py

@@ -6,37 +6,52 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.19 07:00:00                  #
+# Updated Date: 2025.09.04 00:00:00                  #
 # ================================================== #
 
 import io
+from dataclasses import dataclass, field
+from typing import Any, Optional
+
 from pygpt_net.utils import trans
 
 
+@dataclass(slots=True)
 class PidData:
-
-    def __init__(self, pid, meta=None):
-        """Pid Data"""
-        self.pid = pid
-        self.meta = meta
-        self.images_appended = []
-        self.urls_appended = []
-        self.files_appended = []
-        self._buffer = io.StringIO()
-        self._live_buffer = io.StringIO()
-        self._html = io.StringIO()
-        self._document = io.StringIO()
-        self.is_cmd = False
-        self.initialized = False
-        self.loaded = False
-        self.item = None
-        self.use_buffer = False
-        self.name_user = trans("chat.name.user")
-        self.name_bot = trans("chat.name.bot")
-        self.last_time_called = 0
-        self.cooldown = 1 / 6
-        self.throttling_min_chars = 5000
-        self.header = None
+    """Pid Data"""
+    # Required/primary data
+    pid: Any
+    meta: Optional[Any] = None
+
+    # Collections
+    images_appended: list = field(default_factory=list)
+    urls_appended: list = field(default_factory=list)
+    files_appended: list = field(default_factory=list)
+
+    # Internal buffers (excluded from repr to avoid large dumps)
+    _buffer: io.StringIO = field(default_factory=io.StringIO, repr=False)
+    _live_buffer: io.StringIO = field(default_factory=io.StringIO, repr=False)
+    _html: io.StringIO = field(default_factory=io.StringIO, repr=False)
+    _document: io.StringIO = field(default_factory=io.StringIO, repr=False)
+
+    # Flags/state
+    is_cmd: bool = False
+    initialized: bool = False
+    loaded: bool = False
+    item: Optional[Any] = None
+    use_buffer: bool = False
+
+    # Names
+    name_user: str = field(default_factory=lambda: trans("chat.name.user"))
+    name_bot: str = field(default_factory=lambda: trans("chat.name.bot"))
+
+    # Throttling / timing
+    last_time_called: float = 0.0
+    cooldown: float = 1 / 6
+    throttling_min_chars: int = 5000
+
+    # Misc
+    header: Optional[Any] = None
 
     @property
     def buffer(self) -> str:

pygpt_net/core/render/web/renderer.py

@@ -6,16 +6,19 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 02:00:00                  #
+# Updated Date: 2025.09.04 00:00:00                  #
 # ================================================== #
 
 import json
 import os
 import re
+import gc
+from dataclasses import dataclass, field
 
 from datetime import datetime
 from typing import Optional, List, Any
 from time import monotonic
+from io import StringIO
 
 from pygpt_net.core.render.base import BaseRenderer
 from pygpt_net.core.text.utils import has_unclosed_code_tag
@@ -48,6 +51,46 @@ class Renderer(BaseRenderer):
     )
     RE_AMP_LT_GT = re.compile(r'&(lt|gt);')
 
+    @dataclass(slots=True)
+    class _AppendBuffer:
+        """Small, allocation-friendly buffer for throttled appends."""
+        _buf: StringIO = field(default_factory=StringIO, repr=False)
+        _size: int = 0
+
+        def append(self, s: str) -> None:
+            if not s:
+                return
+            self._buf.write(s)
+            self._size += len(s)
+
+        def is_empty(self) -> bool:
+            return self._size == 0
+
+        def get_and_clear(self) -> str:
+            """Return content and replace underlying buffer to release memory eagerly."""
+            if self._size == 0:
+                return ""
+            data = self._buf.getvalue()
+            old = self._buf
+            # Replace the internal buffer instance to drop capacity immediately
+            self._buf = StringIO()
+            self._size = 0
+            try:
+                old.close()
+            except Exception:
+                pass
+            return data
+
+        def clear(self) -> None:
+            """Clear content and drop buffer capacity."""
+            old = self._buf
+            self._buf = StringIO()
+            self._size = 0
+            try:
+                old.close()
+            except Exception:
+                pass
+
     def __init__(self, window=None):
         super(Renderer, self).__init__(window)
         """
@@ -69,7 +112,7 @@ class Renderer(BaseRenderer):
         self._file_prefix = 'file:///' if self.window and self.window.core.platforms.is_windows() else 'file://'
 
         self._thr = {}
-        self._throttle_interval = 0.01 # 10 ms delay
+        self._throttle_interval = 0.03  # 30 ms delay
 
     def prepare(self):
         """
@@ -328,6 +371,9 @@ class Renderer(BaseRenderer):
         except Exception:
             pass
 
+        # release strings
+        gc.collect()
+
     def append_context(
             self,
             meta: CtxMeta,
@@ -597,7 +643,7 @@ class Renderer(BaseRenderer):
             if self.window.core.config.get("agent.output.render.all", False):
                 output = ctx.output  # full agent output
             else:
-                output = ctx.extra["output"] # final output only
+                output = ctx.extra["output"]  # final output only
         else:
             if not output:
                 return
@@ -656,6 +702,7 @@ class Renderer(BaseRenderer):
         pid = self.get_or_create_pid(meta)
         pctx = self.pids[pid]
         pctx.item = ctx
+
         if not text_chunk:
             if begin:
                 pctx.clear()
@@ -663,13 +710,16 @@ class Renderer(BaseRenderer):
                 self._throttle_reset(pid)
             return
 
-        if begin:  # prepare name and avatar header only at the beginning to avoid unnecessary checks
+        if begin:
+            # Prepare name header once per streaming session
             pctx.header = self.get_name_header(ctx, stream=True)
             self.update_names(meta, ctx)
 
         name_header_str = pctx.header
         text_chunk = text_chunk if isinstance(text_chunk, str) else str(text_chunk)
-        text_chunk = text_chunk.translate({ord('<'): '&lt;', ord('>'): '&gt;'})
+        # Escape angle brackets only if present to avoid unnecessary allocations
+        if ('<' in text_chunk) or ('>' in text_chunk):
+            text_chunk = text_chunk.translate({ord('<'): '&lt;', ord('>'): '&gt;'})
 
         if begin:
             if self.is_debug():
@@ -683,42 +733,69 @@ class Renderer(BaseRenderer):
             self.clear_chunks_output(pid)
             self.prev_chunk_replace = False
 
+        # Append to the logical buffer (owned by pid)
         pctx.append_buffer(text_chunk)
-
         buffer = pctx.buffer
-        if has_unclosed_code_tag(buffer):
-            buffer_to_parse = "".join((buffer, "\n```"))
-        else:
-            buffer_to_parse = buffer
 
-        html = self.parser.parse(buffer_to_parse)
-        del buffer_to_parse
-        is_code_block = html.endswith(self.ENDINGS_CODE)
-        is_list = html.endswith(self.ENDINGS_LIST)
+        # Cheap detection of open code fence without full parse
+        open_code = has_unclosed_code_tag(buffer)
+
+        # Newline/flow state
         is_n = "\n" in text_chunk
-        is_newline = is_n or buffer.endswith("\n") or is_code_block
-        force_replace = False
-        if self.prev_chunk_newline:
-            force_replace = True
-        if is_n:
-            self.prev_chunk_newline = True
-        else:
-            self.prev_chunk_newline = False
+        is_newline = is_n or buffer.endswith("\n") or open_code
+        force_replace = self.prev_chunk_newline
+        self.prev_chunk_newline = bool(is_n)
 
         replace = False
-        if is_newline or force_replace or is_list:
+        if is_newline or force_replace:
             replace = True
-            if is_code_block:
-                if not is_n:
-                    replace = False
+            # Do not replace for an open code block unless a newline arrived
+            if open_code and not is_n:
+                replace = False
+
+        thr = self._throttle_get(pid)
+        html = None
 
+        # Only parse when required:
+        # - a replace is needed now, or
+        # - a replace is pending in the throttle and must be refreshed, or
+        # - rarely: we must detect list termination without a newline
+        need_parse_for_pending_replace = (thr["op"] == 1)
+        need_parse_for_list = False
+
+        if not replace:
+            # Very rare case: list closing without newline. Check on a short tail only.
+            # This keeps behavior intact while avoiding full-buffer parse on every chunk.
+            tail = buffer[-4096:]
+            if tail:
+                tail_to_parse = f"{tail}\n```" if open_code else tail
+                tail_html = self.parser.parse(tail_to_parse)
+                need_parse_for_list = tail_html.endswith(self.ENDINGS_LIST)
+                # Tail string is short and will be collected promptly
+                del tail_html
+            if need_parse_for_list:
+                replace = True
+
+        if replace or need_parse_for_pending_replace:
+            buffer_to_parse = f"{buffer}\n```" if open_code else buffer
+            html = self.parser.parse(buffer_to_parse)
+            # Help the GC by breaking the reference as soon as possible
+            del buffer_to_parse
+
+        is_code_block = open_code
+
+        # Adjust output chunk formatting based on block type
         if not is_code_block:
             if is_n:
+                # Convert text newlines to <br/> in non-code context
                 text_chunk = text_chunk.replace("\n", "<br/>")
         else:
+            # When previous operation replaced content and this chunk closes the fence,
+            # prepend a newline so the final code block renders correctly.
             if self.prev_chunk_replace and (is_code_block and not has_unclosed_code_tag(text_chunk)):
                 text_chunk = "\n" + text_chunk
 
+        # Update replace flag for next iteration AFTER formatting decisions
         self.prev_chunk_replace = replace
 
         if begin:
@@ -727,7 +804,19 @@ class Renderer(BaseRenderer):
             except Exception:
                 pass
 
-        self._throttle_queue(pid, name_header_str or "", html, text_chunk, replace, is_code_block)
+        # Queue throttled emission; HTML is only provided when it is really needed
+        self._throttle_queue(
+            pid=pid,
+            name=name_header_str or "",
+            html=html if html is not None else "",
+            text_chunk=text_chunk,
+            replace=replace,
+            is_code_block=is_code_block,
+        )
+        # Explicitly drop local ref to large html string as early as possible
+        html = None
+
+        # Emit if throttle interval allows
         self._throttle_emit(pid, force=False)
 
     def next_chunk(
@@ -1276,7 +1365,7 @@ class Renderer(BaseRenderer):
             extra = ctx.extra["footer"]
             extra_style = "display:block;"
 
-        return  f'<div class="msg-box msg-user" id="{msg_id}"><div class="name-header name-user">{name}</div><div class="msg">{html}<div class="msg-extra" style="{extra_style}">{extra}</div>{debug}</div></div>'
+        return f'<div class="msg-box msg-user" id="{msg_id}"><div class="name-header name-user">{name}</div><div class="msg">{html}<div class="msg-extra" style="{extra_style}">{extra}</div>{debug}</div></div>'
 
     def prepare_node_output(
             self,
@@ -1289,7 +1378,7 @@ class Renderer(BaseRenderer):
         """
         Prepare output node
 
-        :param meta: context meta
+        :param meta: CtxMeta
         :param ctx: CtxItem instance
         :param html: html text
         :param prev_ctx: previous context item
@@ -1772,6 +1861,9 @@ class Renderer(BaseRenderer):
         """
         if not html:
             return ""
+        # Fast path: avoid regex work and extra allocations when not needed
+        if '&amp;' not in html:
+            return html
         return self.RE_AMP_LT_GT.sub(r'&\1;', html)
 
     def append_debug(
@@ -1819,7 +1911,14 @@ class Renderer(BaseRenderer):
         """
         thr = self._thr.get(pid)
         if thr is None:
-            thr = {"last": 0.0, "op": 0, "name": "", "replace_html": "", "append": [], "code": False}
+            thr = {
+                "last": 0.0,
+                "op": 0,
+                "name": "",
+                "replace_html": "",
+                "append": Renderer._AppendBuffer(),
+                "code": False,
+            }
             self._thr[pid] = thr
         return thr
 
@@ -1837,7 +1936,8 @@ class Renderer(BaseRenderer):
         thr["op"] = 0
         thr["name"] = ""
         thr["replace_html"] = ""
-        thr["append"].clear()
+        # Replace append buffer instance to drop any capacity eagerly
+        thr["append"] = Renderer._AppendBuffer()
         thr["code"] = False
 
     def _throttle_queue(
@@ -1866,10 +1966,12 @@ class Renderer(BaseRenderer):
         if replace:
             thr["op"] = 1
             thr["replace_html"] = html
+            # Drop previous append items aggressively when a replace snapshot is available
             thr["append"].clear()
             thr["code"] = bool(is_code_block)
         else:
             if thr["op"] == 1:
+                # Refresh the pending replace with the latest HTML snapshot
                 thr["replace_html"] = html
                 thr["code"] = bool(is_code_block)
                 return
@@ -1895,17 +1997,21 @@ class Renderer(BaseRenderer):
 
         try:
             if thr["op"] == 1:
+                # Replace snapshot
+                replace_payload = self.sanitize_html(thr["replace_html"])
                 node.page().bridge.chunk.emit(
                     thr["name"],
-                    self.sanitize_html(thr["replace_html"]),
+                    replace_payload,
                     "",
                     True,
                     bool(thr["code"]),
                 )
+                thr["replace_html"] = ""  # Cut reference ASAP
                 thr["last"] = now
 
-                if thr["append"]:
-                    append_str = "".join(thr["append"])
+                # Append tail (if any)
+                if not thr["append"].is_empty():
+                    append_str = thr["append"].get_and_clear()
                     node.page().bridge.chunk.emit(
                         thr["name"],
                         "",
@@ -1917,8 +2023,8 @@ class Renderer(BaseRenderer):
 
                 self._throttle_reset(pid)
 
-            elif thr["op"] == 2 and thr["append"]:
-                append_str = "".join(thr["append"])
+            elif thr["op"] == 2 and not thr["append"].is_empty():
+                append_str = thr["append"].get_and_clear()
                 node.page().bridge.chunk.emit(
                     thr["name"],
                     "",

pygpt_net/core/text/utils.py

@@ -60,6 +60,9 @@ def output_clean_html(html: str) -> str:
         # remove action icons
         for tag in soup.select('div.action-icons'):
             tag.decompose()
+        # remove scripts
+        for tag in soup.select('script'):
+            tag.decompose()
         return str(soup)
     except Exception:
         pass

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.6.33",
-    "app.version": "2.6.33",
-    "updated_at": "2025-09-02T00:00:00"
+    "version": "2.6.36",
+    "app.version": "2.6.36",
+    "updated_at": "2025-09-04T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -354,6 +354,7 @@
   "painter.brush.mode": "brush",
   "painter.brush.size": 3,
   "painter.canvas.size": "1280x720",
+  "painter.zoom": 100,
   "personalize.about": "",
   "personalize.modes": "chat",
   "plugins": {},

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.6.33",
-        "app.version": "2.6.33",
-        "updated_at": "2025-09-02T08:03:34"
+        "version": "2.6.36",
+        "app.version": "2.6.36",
+        "updated_at": "2025-09-04T08:03:34"
     },
     "items": {
         "SpeakLeash/bielik-11b-v2.3-instruct:Q4_K_M": {

pygpt_net/data/config/settings.json

@@ -1520,7 +1520,8 @@
     },
     "vision.capture.idx": {
         "section": "vision",
-        "type": "int",
+        "type": "combo",
+        "use": "camera_devices",
         "slider": true,
         "label": "settings.vision.capture.idx",
         "description": "settings.vision.capture.idx.desc",
@@ -1529,7 +1530,8 @@
         "max": 3,
         "multiplier": 1,
         "step": 1,
-        "advanced": false
+        "advanced": false,
+        "tab": "camera"
     },
     "vision.capture.width": {
         "section": "vision",
@@ -1541,7 +1543,8 @@
         "max": 4096,
         "multiplier": 1,
         "step": 1,
-        "advanced": false
+        "advanced": false,
+        "tab": "camera"
     },
     "vision.capture.height": {
         "section": "vision",
@@ -1553,7 +1556,8 @@
         "max": 4096,
         "multiplier": 1,
         "step": 1,
-        "advanced": false
+        "advanced": false,
+        "tab": "camera"
     },
     "vision.capture.quality": {
         "section": "vision",
@@ -1565,7 +1569,8 @@
         "max": 100,
         "multiplier": 1,
         "step": 1,
-        "advanced": false
+        "advanced": false,
+        "tab": "camera"
     },    
     "audio.input.backend": {
         "section": "audio",

pygpt_net/data/css/web-blocks.css

@@ -13,7 +13,6 @@ body {{
     word-wrap: break-word;
     padding: 6px;
     line-height: 1.25;
-    will-change: transform, opacity;
     margin: 4px;
     padding: 0;
     max-width: 100%;
@@ -24,12 +23,14 @@ body {{
 }}
 ::-webkit-scrollbar-thumb {{
     -webkit-border-radius: 1ex;
-    -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    -webkit-box-shadow: none;
+}}
+#container {{
+    will-change: transform, opacity;
 }}
 .ts {{
     display: none;
 }}
-
 /* base */
 a {{
     text-decoration: none;

pygpt_net/data/css/web-chatgpt.css

@@ -13,7 +13,6 @@ body {{
     word-wrap: break-word;
     padding: 6px;
     line-height: 1.25;
-    will-change: transform, opacity;
     padding: 0;
     margin: auto;
     max-width: 720px;
@@ -25,7 +24,10 @@ body {{
 }}
 ::-webkit-scrollbar-thumb {{
     -webkit-border-radius: 1ex;
-    -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    -webkit-box-shadow: none;
+}}
+#container {{
+    will-change: transform, opacity;
 }}
 .ts {{
     display: none;

pygpt_net/data/css/web-chatgpt_wide.css

@@ -13,7 +13,6 @@ body {{
     word-wrap: break-word;
     padding: 6px;
     line-height: 1.25;
-    will-change: transform, opacity;
     padding: 0;
     margin: auto;
     max-width: 100%;
@@ -25,7 +24,10 @@ body {{
 }}
 ::-webkit-scrollbar-thumb {{
     -webkit-border-radius: 1ex;
-    -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    -webkit-box-shadow: none;
+}}
+#container {{
+    will-change: transform, opacity;
 }}
 .ts {{
     display: none;

pygpt_net/data/locale/locale.de.ini

@@ -957,10 +957,11 @@ output.tips.7 = Für eine bessere Leistung deaktivieren Sie die Werkzeuge, wenn
 output.tips.8 = Wenn Sie lokale Modelle verwenden, denken Sie daran, das lokale Modell auch für die Kontextzusammenfassung und Einbettungen einzustellen.
 output.tips.9 = Um Audio-Ein- und Ausgangsanbieter zu konfigurieren, gehen Sie zu Plugins -> Einstellungen. Um Audiogeräte zu konfigurieren, gehen Sie zu Konfiguration -> Einstellungen -> Audio.
 output.tips.prefix = Tipp
-painter.btn.crop = Zuschneiden
 painter.btn.camera.capture = Von der Kamera
 painter.btn.capture = Bild erfassen
 painter.btn.clear = Löschen
+painter.btn.crop = Zuschneiden
+painter.btn.fit = Anpassen
 painter.capture.manual.captured.success = Bild erfasst:
 painter.capture.name.prefix = Zeichnung von
 painter.mode.erase = Radieren
@@ -1364,7 +1365,8 @@ settings.section.remote_tools = Fernwerkzeuge
 settings.section.remote_tools.openai = OpenAI
 settings.section.tab.general = Allgemein
 settings.section.updates = Aktualisierungen
-settings.section.vision = Vision
+settings.section.vision = Vision und Kamera
+settings.section.vision.camera = Kamera
 settings.store_history = Verlauf speichern
 settings.store_history_time = Uhrzeit im Verlauf speichern
 settings.temperature = Temperatur
@@ -1394,11 +1396,11 @@ settings.video.seed = Startwert
 settings.video.seed.desc = Optionaler Zufallsstartwert für reproduzierbare Ergebnisse; leer lassen für zufällig
 settings.vision.capture.auto = Automatisches Erfassen
 settings.vision.capture.enabled = Kamera
-settings.vision.capture.height = Kamerabildhöhe (px)
-settings.vision.capture.idx = Kameraindex (Nummer)
-settings.vision.capture.idx.desc = Kamera-Index zur Videoaufzeichnung (Index der Kamera, Standard: 0)
-settings.vision.capture.quality = Bildqualität beim Erfassen (%)
-settings.vision.capture.width = Kamerabildbreite (px)
+settings.vision.capture.height = Aufnahmehöhe (in Pixeln)
+settings.vision.capture.idx = Kameragerät
+settings.vision.capture.idx.desc = Wählen Sie ein Kameragerät für die Echtzeit-Videoaufnahme
+settings.vision.capture.quality = Aufnahmequalität (%)
+settings.vision.capture.width = Aufnahmewidth (in Pixeln)
 settings.zoom = Zoomen des Chat-Ausgabefensters
 speech.enable = Sprachausgabe aktivieren
 speech.listening = Sprechen Sie jetzt...

pygpt_net/data/locale/locale.en.ini

@@ -147,6 +147,7 @@ assistant.store.expire_days.desc = 0 = Never
 assistant.store.files.suffix = files
 assistant.store.hide_threads = Hide threads vector stores
 assistant.store.id = ID
+assistant.store.menu.file.delete = Delete file
 assistant.store.name = Name
 assistant.store.status = Status
 assistant.store.thread_only = (current thread only)
@@ -250,6 +251,7 @@ confirm.assistant.import = Import all assistants from API?
 confirm.assistant.import_files = Import all files from API?
 confirm.assistant.import_files.store = Import current store files from API?
 confirm.assistant.store.clear = Clear vector stores (local only)?
+confirm.assistant.store.file.delete = Delete selected file in API?
 confirm.assistant.store.import = Import all vector stores from API?
 confirm.assistant.store.refresh = Refresh all stores?
 confirm.assistant.store.truncate = Delete all vector stores in API?
@@ -958,10 +960,11 @@ output.tips.7 = For better performance, disable tools when using local models if
 output.tips.8 = When using local models, remember to set the local model for context summary and embeddings as well.
 output.tips.9 = To configure audio input and output providers, go to Plugins -> Settings. To configure audio devices, go to Config -> Settings -> Audio.
 output.tips.prefix = Tip
-painter.btn.crop = Crop
 painter.btn.camera.capture = From camera
 painter.btn.capture = Use image
 painter.btn.clear = Clear
+painter.btn.crop = Crop
+painter.btn.fit = Fit
 painter.capture.manual.captured.success = Image captured:
 painter.capture.name.prefix = Drawing from
 painter.mode.erase = Erase
@@ -1406,7 +1409,8 @@ settings.section.remote_tools.google = Google
 settings.section.remote_tools.openai = OpenAI
 settings.section.tab.general = General
 settings.section.updates = Updates
-settings.section.vision = Vision
+settings.section.vision = Vision and camera
+settings.section.vision.camera = Camera
 settings.store_history = Store history
 settings.store_history_time = Store time in history
 settings.temperature = Temperature
@@ -1436,11 +1440,11 @@ settings.video.seed = Seed
 settings.video.seed.desc = Optional random seed for reproducible results; leave empty for random
 settings.vision.capture.auto = Auto capture
 settings.vision.capture.enabled = Camera
-settings.vision.capture.height = Camera height (px)
-settings.vision.capture.idx = Camera Input Device
-settings.vision.capture.idx.desc = Video capture camera index (index of the camera, default: 0)
+settings.vision.capture.height = Capture height (in pixels)
+settings.vision.capture.idx = Camera Device
+settings.vision.capture.idx.desc = Select a camera device for real-time video capture
 settings.vision.capture.quality = Capture quality (%)
-settings.vision.capture.width = Camera width (px)
+settings.vision.capture.width = Capture width (in pixels)
 settings.zoom = Chat output window zoom
 speech.enable = Speak
 speech.listening = Speak now...