Index: /branches/amp_4_0/platform/config/init_db.sql =================================================================== --- /branches/amp_4_0/platform/config/init_db.sql (revision 2658) +++ /branches/amp_4_0/platform/config/init_db.sql (working copy) @@ -417,6 +417,6 @@ end_time TIMESTAMP DEFAULT NULL, status integer DEFAULT 0, result TEXT DEFAULT NULL, - FOREIGN KEY (report_id) REFERENCES REPORT(id) ON DELETE CASCADE, + FOREIGN KEY (report_id) REFERENCES REPORT(id) ON DELETE CASCADE ); -- psql -U amp_admin -d cm -f /path/to/your/init_db.sql Index: /branches/amp_4_0/platform/dependencies/python/get_offline_packages.sh =================================================================== --- /branches/amp_4_0/platform/dependencies/python/get_offline_packages.sh (revision 2658) +++ /branches/amp_4_0/platform/dependencies/python/get_offline_packages.sh (working copy) @@ -1,3 +1,3 @@ #!/usr/bin/env bash -pip3 download -r ./requirements.txt --dest offline_pip_packages/ --platform linux-x86_64 --python-version 313 --implementation cp --abi cp313 --only-binary=:all: +pip3 download -r ./requirements.txt --dest offline_pip_packages/ --platform linux-x86_64 --python-version 313 --implementation cp --abi cp313 Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/Wand-0.6.13-py2.py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/Wand-0.6.13-py2.py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/certifi-2025.6.15-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/certifi-2025.6.15-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/dynuipv4update-0.12-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/dynuipv4update-0.12-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/getpublicipv4-0.12-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/getpublicipv4-0.12-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/joblib-1.5.1-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/joblib-1.5.1-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/kthread-0.2.3-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/kthread-0.2.3-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/kthread_sleep-0.11-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/kthread_sleep-0.11-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/numpy-2.3.1-cp313-cp313t-manylinux_2_28_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/numpy-2.3.1-cp313-cp313t-manylinux_2_28_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/ordered_set-4.1.0-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/ordered_set-4.1.0-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/pfehler-0.10-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/pfehler-0.10-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/pillow-11.2.1-cp313-cp313t-manylinux_2_28_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/pillow-11.2.1-cp313-cp313t-manylinux_2_28_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/prettytable-3.16.0-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/prettytable-3.16.0-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/psycopg2_binary-2.9.10-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/psycopg2_binary-2.9.10-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/pyecharts-2.0.8-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/pyecharts-2.0.8-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/pymongo-4.13.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/pymongo-4.13.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/scikit_learn-1.7.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/scikit_learn-1.7.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/scipy-1.16.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/scipy-1.16.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/simplejson-3.20.1-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/simplejson-3.20.1-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/stderrstdoutcapture-0.10-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/stderrstdoutcapture-0.10-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/thread-2.0.5-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/thread-2.0.5-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/threadpoolctl-3.6.0-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/threadpoolctl-3.6.0-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/touchtouch-0.11-py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/touchtouch-0.11-py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/offline_pip_packages/wcwidth-0.2.13-py2.py3-none-any.whl =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: platform/dependencies/python/offline_pip_packages/wcwidth-0.2.13-py2.py3-none-any.whl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: /branches/amp_4_0/platform/dependencies/python/requirements.txt =================================================================== --- /branches/amp_4_0/platform/dependencies/python/requirements.txt (revision 2658) +++ /branches/amp_4_0/platform/dependencies/python/requirements.txt (working copy) @@ -1,40 +1,95 @@ anyio==4.9.0 APScheduler==3.11.0 asgiref==3.8.1 -certifi==2025.4.26 +backports.ssl-match-hostname==3.5.0.1 +configobj==4.7.2 +certifi==2025.6.15 chardet==5.2.0 charset-normalizer==3.4.2 cssselect2==0.8.0 +decorator==3.4.0 dicttoxml==1.7.16 Django==5.2.3 +django-revproxy==0.10.0 dnspython==2.7.0 -elastic-transport==8.17.1 +dynuipv4update==0.12 elasticsearch==9.0.2 +elastic-transport==8.17.1 +flup==1.0.2 +funcsigs==1.0.2 +futures==3.1.1 fonttools==4.58.2 +getpublicipv4==0.12 h11==0.16.0 httpcore==1.0.9 httpx==0.28.1 idna==3.10 +influxdb==5.3.1 influxdb-client==1.49.0 +iniparse==0.4 +ipaddress==1.0.16 +javapackages==1.0.0 +Jinja2==2.7.2 +joblib==1.5.0 +kthread==0.2.3 +kthread-sleep==0.11 +lxml==3.2.1 +M2Crypto==0.25.1 +MarkupSafe==3.0.2 +msgpack==1.0.4 +numpy==2.2.6 +ordered-set==4.1.0 +perf==0.1 +Pillow==4.0.0 +pfehler==0.10 +pillow==11.2.1 +prettytable==3.16.0 +psutil==5.0.0 +psycopg2==2.7.5 +psycopg2-binary==2.9.10 pyasynchat==1.0.4 pyasyncore==1.0.4 -pycparser==2.22 -pydyf==0.11.0 -pyphen==0.17.2 +pycurl==7.19.0 +pyecharts==2.0.8 +pyftpdlib==1.5.2 +pygobject==3.22.0 +pygpgme==0.3 +pymongo==4.13.2 +pyliblzma==0.5.3 +python-linux-procfs==0.4.9 python-dateutil==2.9.0.post0 -pytz==2025.2 +pytz==2017.2 +pyudev==0.15 +pyxattr==0.5.1 reactivex==4.0.4 +reportlab==4.4.1 requests==2.32.4 rpm==0.4.0 -setuptools==80.4.0 +scikit-learn==1.6.1 +scipy==1.15.3 +schedule==0.6.0 +schedutils==0.4 +setuptools==80.9.0 +simplejson==3.20.1 six==1.17.0 +slip==0.4.0 +slip.dbus==0.4.0 sniffio==1.3.1 sqlparse==0.5.3 -tftpy==0.8.5 +stderrstdoutcapture==0.10 tinycss2==1.4.0 tinyhtml5==2.0.0 +thread==2.0.5 +threadpoolctl==3.6.0 toml==0.10.2 +touchtouch==0.11 +tftpy==0.8.5 typing_extensions==4.14.0 tzlocal==5.3.1 +urlgrabber==3.10 urllib3==2.4.0 +Wand==0.6.13 webencodings==0.5.1 +wcwidth==0.2.13 +Whoosh==2.7.4 +yum-metadata-parser==1.1.4 \ No newline at end of file Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/urls.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/urls.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/urls.py (working copy) @@ -2,8 +2,7 @@ from cm.router import * -app_urlpatterns = ['', - re_path(r'^cm/configuration/device/get_schedule_backup_all$', fetch_schedule_backup_all), +app_urlpatterns = [re_path(r'^cm/configuration/device/get_schedule_backup_all$', fetch_schedule_backup_all), re_path(r'^cm/configuration/device/clear_schedule_backup_all$', clear_schedule_backup_all), re_path(r'^cm/configuration/configuration_file/(?P.*)$', get_configuration), re_path(r'^cm/va_mgmt/vnc_host_info$', vnc_host_info), Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/djproject/settings.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/djproject/settings.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/djproject/settings.py (working copy) @@ -92,7 +92,7 @@ # 'django.template.loaders.eggs.Loader', ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -194,7 +194,7 @@ 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', 'filename': '/var/log/hive.log', - 'maxBytes': 1024 * 1024 * 50, # 50 MB + 'maxBytes': 1024 * 1024 * 50, # 50 MBDEBUG 'backupCount': 2, 'formatter': 'standard', }, Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/model/legacycli.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/model/legacycli.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/model/legacycli.py (working copy) @@ -115,10 +115,10 @@ MODE_CONFIG = CLIMode('CONFIG', 2) MODE_ENGINEER = CLIMode('ENGINEER', 3) -F_EOU = '\xFD' -F_EOP = '\xFC' -F_EOC = '\xFB' -F_EOS = '\xFA' +F_EOU = b'\xFD' +F_EOP = b'\xFC' +F_EOC = b'\xFB' +F_EOS = b'\xFA' # This line is just for loading the settings xxx = settings.INSTALLED_APPS @@ -187,7 +187,7 @@ :param sessid: Session ID specified by caller. If set None, a auto-generated Session ID is used. :type sessid: str - + :param address: IP Address of webui_agent service :type address: str of IP address """ @@ -248,7 +248,7 @@ try: sent = _thread_locals._hive_socket.send(msg[totalsent:]) except socket.error: - # reconnect and resend + # reconnect and resend self._connect() retries += 1 continue @@ -265,7 +265,7 @@ return totalsent def _receive(self, token): - output = '' + output = b'' while True: try: data = _thread_locals._hive_socket.recv(512) @@ -337,8 +337,14 @@ cmd_str = cmd.encode('utf-8') while len(cmd_str) > 0: - each_cmd = cmd_str[:cmd_len] + F_EOC + self._username.encode('utf-8') + F_EOU + session_id.encode( - 'utf-8') + F_EOS + each_cmd = ( + cmd_str[:cmd_len] + + F_EOC + + self._username.encode('utf-8') + + F_EOU + + session_id.encode('utf-8') + + F_EOS + ) self._send(each_cmd) if len(cmd_str) > cmd_len: cmd_str = cmd_str[cmd_len:] @@ -391,7 +397,8 @@ :returns: MODE_USER | MODE_ENABLE | MODE_CONFIG | MODE_ENGINEER """ - out = self.cmd('mode?\n') + b_data = self.cmd('mode?\n') + out = b_data.decode('utf-8') if out[0:2] == 'US': return MODE_USER elif out[0:3] == 'ENA': @@ -501,7 +508,7 @@ :type prefix: str :param match_list: A list of matching rules (string) for analyzing the output line (cutting the prefix). - The format of each rule string is "?" which means specific data is fetched to the field; or "=" which + The format of each rule string is "?" which means specific data is fetched to the field; or "=" which means specific data must equals the target data or else the line is ignored. :type match_list: list of str """ @@ -655,7 +662,7 @@ * ``WHOLE`` - The whole match (a string) is returned * ``DICT`` - The data is a dictionary containing matching attributes based on the ``(?P)``-style pattern. * ``LIST`` - The data is a list containing matching attributes acquired by the Python ``re`` libraries ``groups()`` API. - * ``AUTO`` - If any (?P) pattern is found in the pattern, ``DICT`` is used, else ``LIST`` is used. + * ``AUTO`` - If any (?P) pattern is found in the pattern, ``DICT`` is used, else ``LIST`` is used. * ``RAW`` - The data is a raw Python ``re`` ``match_object`` for the caller to analyze the data. :type result: ``DICT`` | ``LIST`` | ``AUTO`` | ``RAW`` @@ -770,7 +777,7 @@ """ Implementation of the CLI output parser **workflow** **parser_obj** could be a single :py:class:`ANCLIParser` or a list of it. - + If it's a single parser, the parser will ``parse()`` the command output and return the result as defined in the parser. If it's a parser list, the parsers will call their own ``parse()`` functions one by one over the same ``cmd_output``, and all results are collected into a list and returned. Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py (working copy) @@ -431,7 +431,18 @@ class HiveSessionMiddleware(object): global_thread_id = 1 - def process_request(self, request): + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + response = self._process_request(request) + if response is not None: + return response + + response = self.get_response(request) + return response + + def _process_request(self, request): if getattr(_thread_locals, '_hive_thread_id', -1) == -1: _thread_locals._hive_thread_id = HiveSessionMiddleware.global_thread_id HiveSessionMiddleware.global_thread_id += 1 Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/shared.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/shared.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/shared.py (working copy) @@ -33,7 +33,7 @@ return HttpResponse(template.render(ctx)) -def custom_500_view(request, exception): +def custom_500_view(request): sess = get_current_session() django_ctx = RequestContext(request) env = HiveEnvironment(loader=ChoiceLoader([PackageLoader('hive', 'templates')])) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/lib/yaml/__init__.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/lib/yaml/__init__.py (revision 2658) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/lib/yaml/__init__.py (working copy) @@ -1,11 +1,11 @@ -from error import * +from .error import * -from tokens import * -from events import * -from nodes import * +from .tokens import * +from .events import * +from .nodes import * -from loader import * -from dumper import * +from .loader import * +from .dumper import * __version__ = '5.3.1' \ No newline at end of file