From 7a7aec306826621dd7659a4ea68dcece4f10e8b0 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 5 Aug 2024 01:35:47 +0000 Subject: [PATCH 1/4] merge first cap entry. --- docker/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 2d24dd0b..da478531 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libvulkan-dev \ pybind11-dev WORKDIR /root -RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.115 +RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.116 COPY --from=iqtlabs/gamutrf-vkfft:latest /root /root/gr-iqtlabs WORKDIR /root/gr-iqtlabs/build COPY --from=iqtlabs/gamutrf-sigmf:latest /usr/local /usr/local From 22e1ad8168803df5b71b4af6f902f56cf63c43e3 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 5 Aug 2024 01:52:13 +0000 Subject: [PATCH 2/4] orig options. --- gamutrf/flask_handler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gamutrf/flask_handler.py b/gamutrf/flask_handler.py index 874d75e5..7067f56b 100644 --- a/gamutrf/flask_handler.py +++ b/gamutrf/flask_handler.py @@ -8,6 +8,7 @@ class FlaskHandler: def __init__(self, options, check_options, banned_args): self.check_options = check_options self.options = options + self.orig_options = copy.deepcopy(self.orig_options) self.banned_args = banned_args self.reconfigures = 0 self.app = Flask(__name__) @@ -42,7 +43,7 @@ def reconf(self): continue if not hasattr(new_options, arg): return f"no such option {arg}", 400 - val_type = getattr(self.options, arg) + val_type = getattr(self.orig_options, arg) try: if val_type is None: setattr(new_options, arg, val) From 78e181e2642003841e8199ac7708b62d9a8a89c3 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 5 Aug 2024 01:53:25 +0000 Subject: [PATCH 3/4] test. --- gamutrf/flask_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamutrf/flask_handler.py b/gamutrf/flask_handler.py index 7067f56b..7d490095 100644 --- a/gamutrf/flask_handler.py +++ b/gamutrf/flask_handler.py @@ -8,7 +8,7 @@ class FlaskHandler: def __init__(self, options, check_options, banned_args): self.check_options = check_options self.options = options - self.orig_options = copy.deepcopy(self.orig_options) + self.orig_options = copy.deepcopy(self.options) self.banned_args = banned_args self.reconfigures = 0 self.app = Flask(__name__) From 752b7a7faa97e80daf69a4dc6f6e8432cffb6f7f Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 5 Aug 2024 01:57:47 +0000 Subject: [PATCH 4/4] False. --- gamutrf/flask_handler.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gamutrf/flask_handler.py b/gamutrf/flask_handler.py index 7d490095..171aa5c0 100644 --- a/gamutrf/flask_handler.py +++ b/gamutrf/flask_handler.py @@ -44,6 +44,8 @@ def reconf(self): if not hasattr(new_options, arg): return f"no such option {arg}", 400 val_type = getattr(self.orig_options, arg) + if val == "False": + val = False try: if val_type is None: setattr(new_options, arg, val)