Skip to content

Upgrading deps #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-linko merged 7 commits into from
Oct 28, 2025
Merged

Upgrading deps #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dd3c2a
correctly formating AC with typedef values
Oct 20, 2025
a0d0c2f
code cleanup remove debug prints
Oct 20, 2025
dbdfc19
updating submodules to latest commits
Oct 20, 2025
ade3a1f
updating to latest versions
Oct 28, 2025
5b85b7b
updated python from 3.9 to 3.10
Oct 28, 2025
ee0550b
updated required python to >= 3.9
Oct 28, 2025
1e3b24b
Install specific versions of pip and pip-tools for compatibility
BrianSipos Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/anms-core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.10"
Comment thread
d-linko marked this conversation as resolved.
- name: Install dependencies
run: |
pip3 install deps/dtnma-ace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aricodec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.10"
- name: Install dependencies
run: |
pip3 install deps/dtnma-ace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/transcoder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.10"
- name: Install flake8
working-directory: transcoder
run: pip3 install flake8
Expand Down
4 changes: 0 additions & 4 deletions anms-core/anms/shared/manager_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,12 @@ def acknowledge(self, index):
curr_alert = None
with open(self.alert_file, 'r') as f:
alerts = json.load(f)
logger.info(alerts)
logger.info(index)
curr_alert = alerts.get(str(index))
logger.info(curr_alert)
if curr_alert:
logger.info(f"ACK {index}")
curr_alert["visible"]= False
alerts[str(index)] = curr_alert
with open(self.alert_file, 'w') as f:
logger.info(alerts)
json.dump(alerts, f)
except (FileNotFoundError, json.JSONDecodeError):
logger.error("ERROR reading alert.json")
Expand Down
7 changes: 1 addition & 6 deletions anms-ui/public/app/components/management/builder/ActionParameter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default {
return {
ariKey: undefined,
ac: [],
result: { index: this.index, type: "AC", value: [] },
result: { index: this.index, type: this.type, value: [] },
keys: [],
currAc: [],
keysRealIndex: [],
Expand All @@ -65,14 +65,9 @@ export default {
this.addToList();
},
addToList: function () {
if(this.ac.length >= this.count){
this.ac.pop();
}

if (this.ariKey != null) {
this.ac.push(this.ariKey)
}

this.ariKey = null;
this.createAC();
},
Expand Down
29 changes: 17 additions & 12 deletions anms-ui/public/app/components/management/builder/ParameterView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,12 @@ export default {
testResult.push(JSON.stringify(head + value).replaceAll('"', ""));
break;
case "AC": //ac
let curr_str= ""
currValue = [];
let curr_str= ""
currValue = [];
value.forEach((ari) => {
currValue.push(ari);
});
if(currValue.length = 1 ){
testResult.push(currValue[0])
}else{
testResult.push("/AC/("+currValue.join(",")+")");
}
testResult.push("/AC/("+currValue.join(",")+")");
break;

case "EXPR": //ac
Expand All @@ -181,11 +177,20 @@ export default {

break;
default:
if (type.includes("TYPEDEF")){
testResult.push(value[0]);
}else{

testResult.push((value));}
if (type.includes("TYPEDEF")){
let curr_str= ""
currValue = [];
value.forEach((ari) => {
currValue.push(ari);
});
if(currValue.length == 1 ){
testResult.push(currValue[0])
}else{
testResult.push("/AC/("+currValue.join(",")+")");
}
}else{
testResult.push((value));
}

break;
}
Expand Down
2 changes: 1 addition & 1 deletion anms-ui/public/app/components/management/builder/ariBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default {
index: index,
result: [],
name: name,
type: "TYPEDEF",
type: parm,
listComponents: aris,
count: 1,
},
Expand Down
23 changes: 14 additions & 9 deletions anms.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,34 @@ ENV APP_USER=anms
RUN groupadd -r -g 9999 ${APP_USER} && \
useradd -m -r -g ${APP_USER} -u 9999 ${APP_USER}


# This image includes common libraries used by the aricodec and anms-core
# containers.
# Sets environment:
# PY_WHEEL_DIR to local PIP wheel search path
#
FROM anms-base AS dtnma-acelib


# Install System Level Dependencies
RUN --mount=type=cache,target=/var/cache/yum \
dnf -y install gcc-c++ python-devel python3-pip python3-wheel python3-setuptools iputils && \
pip3 install pip-tools
dnf -y install gcc-c++ python-devel python3-pip python3-wheel python3-setuptools iputils

# Use specific OS python version
ENV PIP=pip3
ENV PYTHON=python3
# Submodules with dependencies
ENV PY_WHEEL_DIR=/usr/local/lib/wheels

RUN ${PIP} install --upgrade pip
RUN --mount=type=cache,target=/root/.cache/pip \
${PIP} install --upgrade 'pip~=24.0' 'pip-tools~=7.5'

COPY deps/dtnma-ace /usr/src/dtnma-ace
RUN ${PIP} -v wheel /usr/src/dtnma-ace -w ${PY_WHEEL_DIR} --no-deps
RUN --mount=type=cache,target=/root/.cache/pip \
${PIP} wheel /usr/src/dtnma-ace -w ${PY_WHEEL_DIR} --no-deps

COPY deps/dtnma-camp /usr/src/dtnma-camp
RUN ${PIP} wheel /usr/src/dtnma-camp -w ${PY_WHEEL_DIR} --no-deps
RUN --mount=type=cache,target=/root/.cache/pip \
${PIP} wheel /usr/src/dtnma-camp -w ${PY_WHEEL_DIR} --no-deps

COPY deps/dtnma-adms /usr/src/dtnma-adms

Expand Down Expand Up @@ -189,7 +191,8 @@ ENV APP_WORK_DIR=/opt/app
# Copy over all required content (source, data, etc.)
COPY --chown=${APP_USER}:${APP_USER} transcoder ${APP_WORK_DIR}
# Install all python dependencies
RUN ${PIP} install -r ${APP_WORK_DIR}/requirements.txt
RUN --mount=type=cache,target=/root/.cache/pip \
${PIP} install -r ${APP_WORK_DIR}/requirements.txt

# Tune Final Settings
WORKDIR ${APP_WORK_DIR}
Expand Down Expand Up @@ -239,12 +242,14 @@ ENV APP_WORK_DIR=/usr/src/anms-core

# Requirement of main module
COPY anms-core/pyproject.toml ${APP_WORK_DIR}/
RUN cd ${APP_WORK_DIR} && \
RUN --mount=type=cache,target=/root/.cache/pip \
cd ${APP_WORK_DIR} && \
pip-compile --find-links ${PY_WHEEL_DIR} pyproject.toml && \
${PIP} install --ignore-installed -r requirements.txt
# Actual main package
COPY anms-core/anms ${APP_WORK_DIR}/anms
RUN ${PIP} install ${APP_WORK_DIR}
RUN --mount=type=cache,target=/root/.cache/pip \
${PIP} install ${APP_WORK_DIR}

RUN mkdir -p /usr/local/share/ace && \
cp -R /usr/src/dtnma-adms /usr/local/share/ace/adms
Expand Down
4 changes: 2 additions & 2 deletions aricodec/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = [
description = "ARI CODEC service"
#readme = "README.md"
license = { file="LICENSE" }
requires-python = ">=3.7"
requires-python = ">=3.9"
classifiers = [
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: Apache Software License",
Expand All @@ -19,7 +19,7 @@ classifiers = [
]

dependencies = [
"dtnma-ace ~=2.0.0",
"dtnma-ace",
"paho-mqtt ~=1.6.1",
"sqlalchemy ~=1.4.42",
"psycopg2-binary ~=2.9.5",
Expand Down
2 changes: 1 addition & 1 deletion deps/dtnma-ace
Open in desktop
Submodule dtnma-ace updated 37 files
+6 −22 .github/workflows/build-test.yaml
+69 −0 .github/workflows/formatting.yaml
+34 −0 apply_format.sh
+35 −0 check_format.sh
+6 −3 pyproject.toml
+19 −19 src/ace/adm_set.py
+28 −28 src/ace/adm_yang.py
+98 −45 src/ace/ari.py
+18 −14 src/ace/ari_cbor.py
+1 −6 src/ace/ari_text/__init__.py
+21 −27 src/ace/ari_text/encode.py
+18 −10 src/ace/ari_text/parsemod.py
+17 −9 src/ace/ari_text/util.py
+3 −3 src/ace/cborutil.py
+2 −4 src/ace/constraints/basic.py
+1 −1 src/ace/constraints/core.py
+15 −15 src/ace/lookup.py
+2 −4 src/ace/models.py
+8 −9 src/ace/nickname.py
+7 −8 src/ace/pyang/admtree.py
+6 −6 src/ace/pyang/dtnma_adm.py
+56 −56 src/ace/pyang/dtnma_amm.py
+0 −1 src/ace/tools/ace_ari.py
+20 −20 src/ace/type_constraint.py
+76 −77 src/ace/typing.py
+0 −1 src/ace/util.py
+1 −1 tests/test_adm_set.py
+41 −41 tests/test_adm_yang.py
+3 −6 tests/test_ari.py
+6 −5 tests/test_ari_cbor.py
+8 −2 tests/test_ari_roundtrip.py
+84 −36 tests/test_ari_text.py
+3 −1 tests/test_constraints.py
+6 −7 tests/test_lookup.py
+1 −1 tests/test_nickname.py
+89 −18 tests/test_typing.py
+5 −7 tests/util.py
2 changes: 1 addition & 1 deletion deps/dtnma-adms
Open in desktop
Submodule dtnma-adms updated 5 files
+6 −3 .github/workflows/formatting.yaml
+6 −3 .github/workflows/validate.yaml
+17 −21 ietf-amm-semtype.yang
+46 −29 ietf-dtnma-agent.yang
+23 −2 ietf-network-base.yang
2 changes: 1 addition & 1 deletion deps/dtnma-camp
Open in desktop
Submodule dtnma-camp updated 17 files
+19 −29 .github/workflows/build-test.yaml
+2 −0 .github/workflows/codeql.yml
+70 −0 .github/workflows/formatting.yaml
+34 −0 apply_format.sh
+35 −0 check_format.sh
+0 −1 integration-test/test_c_integration.py
+4 −5 integration-test/test_sql_integration.py
+5 −2 pyproject.toml
+1 −0 src/camp/generators/base.py
+1 −1 src/camp/generators/create_sql.py
+13 −13 src/camp/generators/data/agent.c.jinja
+28 −24 src/camp/generators/lib/campch.py
+331 −333 src/camp/generators/lib/campch_roundtrip.py
+3 −3 src/camp/tools/camp.py
+66 −78 test/data/gen_ch/example_test.c.jinja
+3 −6 test/test_generators.py
+0 −2 test/test_tools_camp.py
2 changes: 1 addition & 1 deletion deps/dtnma-tools
Open in desktop
Submodule dtnma-tools updated 42 files
+72 −0 docs/api/02-cace_ari.md
+3 −0 docs/api/dictionary.txt
+2 −2 docs/api/mainpage.md
+14 −0 docs/api/refs.bib
+332 −198 item-test/test_refda_socket.py
+19 −0 src/cace/amm/idseg_val.h
+1 −1 src/cace/amm/lookup.h
+10 −6 src/cace/amm/obj_ns.c
+10 −0 src/cace/amm/obj_ns.h
+1 −1 src/cace/amm/obj_store.h
+295 −55 src/cace/amm/semtype.c
+73 −3 src/cace/amm/semtype.h
+129 −29 src/cace/amm/typing.c
+46 −58 src/cace/amm/typing.h
+18 −25 src/cace/amp/ion_bp.c
+8 −20 src/cace/amp/socket.c
+15 −1 src/cace/ari/access.c
+22 −2 src/cace/ari/access.h
+10 −10 src/cace/ari/base.c
+2 −2 src/cace/ari/base.h
+8 −0 src/cace/ari/cbor.c
+10 −0 src/cace/ari/containers.c
+7 −0 src/cace/ari/containers.h
+22 −13 src/cace/ari/text_enc.c
+30 −18 src/cace/ari/text_str.yac
+6 −6 src/cace/cace_ari.c
+273 −234 src/refda/adm/ietf_amm_base.c
+136 −125 src/refda/adm/ietf_amm_semtype.c
+0 −2 src/refda/adm/ietf_amm_semtype.h
+899 −698 src/refda/adm/ietf_dtnma_agent.c
+3 −3 src/refda/adm/ietf_network_base.c
+2 −2 src/refda/amm/ident.h
+2 −4 src/refda/binding.c
+9 −0 src/refda/binding.h
+42 −42 src/refda/reporting.c
+2 −3 src/refdm/ingress.c
+67 −4 test/cace/test_amm_typing.c
+1 −1 test/cace/test_ari_roundtrip.c
+2 −2 test/cace/test_ari_text.c
+106 −15 test/refda/test_adm_ietf_dtnma_agent.c
+1 −1 test/refda/test_amm_const.c
+2 −2 test/refda/test_amm_ctrl.c
Loading
⚡