Update model function

softboiler · Jul 18, 2024 · 474e6ea · 474e6ea
1 parent f73ce45
commit 474e6ea
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git a/data/models/modelfun-3.11.dillpickle.dvc b/data/models/modelfun-3.11.dillpickle.dvc
@@ -1,12 +1,12 @@
-md5: a2d8f534e958e3213da9e560e3e6697e
+md5: 7952f6be4194ca8011e1ad9c61d2785f
 frozen: true
 deps:
 - path: data/models/modelfun-3.11.dillpickle
   repo:
-    url: ../boilercore
-    rev_lock: 7a776c8e3b35f8077056922e5f0138ece71a9028
+    url: submodules/boilercore
+    rev_lock: 780ca1358fe8a1959b6602fd603327d37baf57b7
 outs:
-- md5: 79f36b9dd6d19be02ab360ae7a8d801c
-  size: 63301
+- md5: 5496feba82331752a39059cb49cae48a
+  size: 1293
   hash: md5
   path: modelfun-3.11.dillpickle
diff --git a/data/models/modelfun-3.12.dillpickle.dvc b/data/models/modelfun-3.12.dillpickle.dvc
@@ -1,12 +1,12 @@
-md5: 078e2641b466c484ffaeae10b9184231
+md5: 905b922b4e8499c2a004ec7015778b83
 frozen: true
 deps:
 - path: data/models/modelfun-3.12.dillpickle
   repo:
-    url: ../boilercore
-    rev_lock: 7a776c8e3b35f8077056922e5f0138ece71a9028
+    url: submodules/boilercore
+    rev_lock: 780ca1358fe8a1959b6602fd603327d37baf57b7
 outs:
-- md5: 4c8f5419f842a9f1f2de719d8e51a7ed
-  size: 60741
+- md5: 75e092f44d0df89ebfd148838133fc81
+  size: 1112
   hash: md5
   path: modelfun-3.12.dillpickle
diff --git a/lock.json b/lock.json
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -6,7 +6,7 @@ pyside6-essentials==6.7.2 ; sys_platform == 'linux'
 shiboken6==6.7.2 ; sys_platform == 'linux'
 # compilation
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --universal --all-extras --exclude-newer 2024-07-09T22:54:01.158673Z --python-version 3.11 --resolution lowest-direct --override requirements/override.txt requirements/dev.in pyproject.toml docs/pyproject.toml scripts/pyproject.toml tests/pyproject.toml submodules/boilercore/pyproject.toml
+#    uv pip compile --universal --all-extras --exclude-newer 2024-07-18T21:40:09.533221Z --python-version 3.11 --resolution lowest-direct --override requirements/override.txt requirements/dev.in pyproject.toml docs/pyproject.toml scripts/pyproject.toml tests/pyproject.toml submodules/boilercore/pyproject.toml
 -e .
     # via -r requirements/dev.in
 -e docs/
@@ -55,7 +55,7 @@ appnope==0.1.4 ; platform_system == 'Darwin'
     # via ipykernel
 argcomplete==3.4.0
     # via pipx
-astroid==3.2.2
+astroid==3.2.3
     # via sphinx-autodoc2
 asttokens==2.4.1
     # via stack-data
@@ -92,7 +92,7 @@ blosc2==2.7.0
     # via tables
 bottleneck==1.4.0
     # via pandas
-cachetools==5.3.3
+cachetools==5.4.0
     # via google-auth
 cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553a90944ca25c2d687771006e77a024
     # via
@@ -155,7 +155,7 @@ copier==9.2.0
     # via
     #   boilerdaq-tools (scripts/pyproject.toml)
     #   boilerdaq-tools
-coverage==7.5.4
+coverage==7.6.0
     # via pytest-cov
 cryptography==42.0.8
     # via asyncssh
@@ -576,7 +576,7 @@ pipx==1.6.0
     # via
     #   boilerdaq-tools (scripts/pyproject.toml)
     #   boilerdaq-tools
-pkg-about==1.1.6
+pkg-about==1.1.7
     # via libusb
 platformdirs==3.11.0
     # via
@@ -594,7 +594,7 @@ pluggy==1.5.0
     # via pytest
 plumbum==1.8.3
     # via copier
-portalocker==2.10.0
+portalocker==2.10.1
     # via cachier
 posthog==3.5.0
     # via ploomber-core
@@ -652,7 +652,7 @@ pydantic-core==2.16.2
     # via pydantic
 pydata-sphinx-theme==0.15.4
     # via sphinx-book-theme
-pydot==2.0.0
+pydot==3.0.1
     # via dvc
 pygit2==1.15.1
     # via scmrepo
@@ -819,7 +819,7 @@ scmrepo==3.3.6
     #   gto
 semver==3.0.2
     # via gto
-setuptools==70.3.0
+setuptools==71.0.3
     # via
     #   cachier
     #   dulwich
@@ -958,7 +958,7 @@ tabulate==0.9.0
     #   numpydoc
 tinycss2==1.3.0
     # via nbconvert
-tomlkit==0.12.5
+tomlkit==0.13.0
     # via dvc
 tornado==6.4.1
     # via

diff --git a/src/boilerdaq/daq.py b/src/boilerdaq/daq.py
@@ -10,9 +10,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple, Self
 from warnings import warn
 
-from boilercore.fits import fit_from_params
-from boilercore.modelfun import get_model
-from boilercore.models.fit import Fit
+from boilercore.fits import Fit, fit_from_params
 from boilercore.models.geometry import GEOMETRY
 from boilercore.types import Rod
 from pyqtgraph import (
@@ -451,7 +449,7 @@ def __init__(
         self.fit = fit
         self.source = Param(name, unit)  # type: ignore
         self.results_to_fit = results_to_fit
-        self.model, _ = get_model(models)
+        self.model, _ = self.fit.get_models(models)
         self.x = GEOMETRY.rods[rod]
 
     def update(self):

diff --git a/src/boilerdaq/models/params.py b/src/boilerdaq/models/params.py
@@ -2,8 +2,8 @@
 
 from pathlib import Path
 
+from boilercore.fits import Fit
 from boilercore.models import SynchronizedPathsYamlModel
-from boilercore.models.fit import Fit
 from boilercore.models.geometry import Geometry
 from pydantic.v1 import Field
 

diff --git a/submodules/boilercore b/submodules/boilercore
diff --git a/tests/root/data/models/modelfun-3.11.dillpickle b/tests/root/data/models/modelfun-3.11.dillpickle
diff --git a/tests/root/data/models/modelfun-3.12.dillpickle b/tests/root/data/models/modelfun-3.12.dillpickle
+8 −8		dvc.lock
+5 −5		lock-high.json
+0 −1		params.yaml
+139 −5		src/boilercore/fits.py
+0 −44		src/boilercore/modelfun.py
+0 −112		src/boilercore/models/fit.py
+1 −1		src/boilercore/models/params.py
+0 −1		src/boilercore/models/paths.py
+1 −2		src/boilercore/models/types.py
+9 −46		src/boilercore/stages/modelfun.ipynb
+33 −14		src/boilercore/syms.py
+4 −0		tests/boilercore_tests/modelfun/__init__.py
+3 −10		tests/boilercore_tests/modelfun/conftest.py
+11 −20		tests/boilercore_tests/modelfun/test_modelfun.py
+ −		tests/root/data/models/modelfun-3.11.dillpickle
+ −		tests/root/data/models/modelfun-3.12.dillpickle