From 864f7aa0058dcef444a60be8ee4ec7107fe1b976 Mon Sep 17 00:00:00 2001
From: GotthardG <51994228+GotthardG@users.noreply.github.com>
Date: Wed, 10 Dec 2025 10:28:01 +0100
Subject: [PATCH] DAQ: Adding run_number into SampleShortInfo model

---
 common/pyproject.toml                         | 2 +-
 common/src/aaredaqlib/models.py               | 1 +
 daq/pyproject.toml                            | 2 +-
 daq/src/aaredaq/server.py                     | 1 +
 gui/pyproject.toml                            | 2 +-
 gui/src/aaregui/panels/manual_sample_panel.py | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/pyproject.toml b/common/pyproject.toml
index 89728ee7..b82798c8 100644
--- a/common/pyproject.toml
+++ b/common/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "aaredaqlib"
-version = "0.2.66"
+version = "0.2.67"
 description = "Libraries shared between AareDAQ and AareGUI"
 readme = "README.md"
 requires-python = ">=3.11"
diff --git a/common/src/aaredaqlib/models.py b/common/src/aaredaqlib/models.py
index 1eb4e2d6..af771831 100644
--- a/common/src/aaredaqlib/models.py
+++ b/common/src/aaredaqlib/models.py
@@ -382,6 +382,7 @@ class SampleShortInfo(BaseModel):
     puck_name: str
     dewar_name: str
     sample_name: str
+    run_number: int
     aaredb_params: Optional[DataCollectionParameters] = None
     user: str = ""
     pin: Annotated[int, Field(ge=1, le=16)]
diff --git a/daq/pyproject.toml b/daq/pyproject.toml
index e50b7822..b28f5564 100644
--- a/daq/pyproject.toml
+++ b/daq/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "aaredaq"
-version = "0.2.65"
+version = "0.2.67"
 description = "AareDAQ data acquisition server"
 readme = "README.md"
 requires-python = ">=3.11"
diff --git a/daq/src/aaredaq/server.py b/daq/src/aaredaq/server.py
index 7ea166a7..1b7a19dd 100644
--- a/daq/src/aaredaq/server.py
+++ b/daq/src/aaredaq/server.py
@@ -226,6 +226,7 @@ async def sample(token: str = Depends(oauth2_scheme)) -> SampleShortInfo:
     else:
         return SampleShortInfo(
             sample_name="Other user sample",
+            run_number=0,
             puck_name="",
             dewar_name="",
             db_id=-1,
diff --git a/gui/pyproject.toml b/gui/pyproject.toml
index 8d68e539..d26e54b0 100644
--- a/gui/pyproject.toml
+++ b/gui/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "aaregui"
-version = "0.2.66"
+version = "0.2.67"
 description = "Beamline control GUI"
 readme = "README.md"
 requires-python = ">=3.11"
diff --git a/gui/src/aaregui/panels/manual_sample_panel.py b/gui/src/aaregui/panels/manual_sample_panel.py
index 9693cdf2..8219add6 100644
--- a/gui/src/aaregui/panels/manual_sample_panel.py
+++ b/gui/src/aaregui/panels/manual_sample_panel.py
@@ -112,6 +112,7 @@ class ManualSamplePanel(QWidget):
             puck_name="",
             dewar_name="",
             sample_name=self.__sample_name,
+            run_number=-1,
             pin=1,
             aaredb_params=data_processing,
             user=self.__pgroup,