Python313 compatible

FreeTAKServer/README.md

@@ -68,7 +68,7 @@ under /docs, you can find various documents including an UML model of the Domain
 
 ## Requirements
 
-- Python 3.6 (or better)
+- Python 3.13 (or better)
   following Python libraries are required and will be installed automatically by Pip: flask, lxml, pathlib, tabulate, sqlalchemy, setuptools, Flask-SQLAlchemy
 
 ## Installing and using FreeTakServer

FreeTAKServer/components/core/cot_parser/main_cot_parser.py

@@ -6,7 +6,7 @@
 from .xml_element import ExtendedElement
 from lxml import etree
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 
 class TargetXMLToModel_object:

FreeTAKServer/components/core/domain/controllers/dict_to_node_controller.py

@@ -3,19 +3,19 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
-from digitalpy.core.parsing.load_configuration import Configuration as LoadConf
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as LoadConf
 from digitalpy.core.domain.node import Node
 from .domain import Domain
 from lxml import etree
 
 class DictToNodeController(Controller):
     def __init__(
-        self,
-        request: Request,
-        response: Response,
-        sync_action_mapper: ActionMapper,
-        configuration: Configuration,
+            self,
+            request: Request,
+            response: Response,
+            sync_action_mapper: ActionMapper,
+            configuration: Configuration,
     ) -> None:
         super().__init__(request, response, sync_action_mapper, configuration)
         self.domain_controller = Domain(request, response, sync_action_mapper, configuration)
@@ -28,12 +28,12 @@ def execute(self, method=None):
         return getattr(self, method)(**self.request.get_values())
 
     def convert_dict_to_node(
-        self,
-        dictionary: dict,
-        model_object: Node,
-        tracer: Tracer,
-        object_class_name,
-        **kwargs
+            self,
+            dictionary: dict,
+            model_object: Node,
+            tracer: Tracer,
+            object_class_name,
+            **kwargs
     ):
         """fill the node object with the values from the dictionary
 
@@ -61,6 +61,7 @@ def serialize(self, dictionary, node):
             return node
         except Exception as ex:
             print(ex)
+
     def add_value_to_node(self, key, value, node):
         """add a value to a node object"""
         if key == "#text":
@@ -77,7 +78,7 @@ def add_value_to_node(self, key, value, node):
         elif isinstance(value, list) and isinstance(getattr(node, key, None), list):
             self.serialize(value[0], getattr(node, key)[0])
 
-            for i in range(1,len(value)):
+            for i in range(1, len(value)):
                 new_node = self.domain_controller.create_node(LoadConf(), key)
                 self.serialize(value[i], new_node)
 
@@ -109,6 +110,6 @@ def handle_missing_attribute(self, key, value, node):
                 response = self.execute_sub_action("DictToXML")
                 elem = etree.fromstring(response.get_value("xml").encode())
                 node.xml.append(elem)
-                
+
         elif value is not None:
             node.xml.attrib[key] = value

FreeTAKServer/components/core/domain/controllers/domain.py

@@ -1,10 +1,10 @@
 from types import ModuleType
 from typing import Any, List, Optional, Type
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 from digitalpy.core.domain.node import Node
 from digitalpy.core.main.controller import Controller
 from digitalpy.core.main.object_factory import ObjectFactory

FreeTAKServer/components/core/domain/controllers/serialization/xml_serialization/xml_serialization_orchestrator.py

@@ -3,7 +3,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 from .xml_serializer import XmlSerializer
 from .xml_element import ExtendedElement

FreeTAKServer/components/core/domain/domain/_dest.py

@@ -1,7 +1,7 @@
 from FreeTAKServer.model.FTSModel.fts_protocol_object import FTSProtocolObject
 from FreeTAKServer.model.FTSModelVariables.DestVariables import DestVariables as vars
 from FreeTAKServer.components.core.abstract_component.cot_property import CoTProperty
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 from FreeTAKServer.components.core.abstract_component.cot_node import CoTNode
 
 

FreeTAKServer/components/core/domain/domain/_event.py

@@ -1,4 +1,4 @@
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 from .model_constants import EventVariables as vars
 import uuid
 from typing import TYPE_CHECKING

FreeTAKServer/components/core/domain/domain/_marti.py

@@ -2,7 +2,7 @@
 
 from FreeTAKServer.model.FTSModel.fts_protocol_object import FTSProtocolObject
 from FreeTAKServer.model.FTSModel.Dest import Dest as DestObject
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 from FreeTAKServer.components.core.abstract_component.cot_node import CoTNode
 from FreeTAKServer.components.core.abstract_component.cot_property import CoTProperty
 

FreeTAKServer/components/core/domain/domain/_usericon.py

@@ -12,7 +12,7 @@
 from FreeTAKServer.components.core.abstract_component.cot_node import CoTNode
 from FreeTAKServer.components.core.abstract_component.cot_property import CoTProperty
 
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 
 class usericon(CoTNode):
     def __init__(self, configuration: Configuration, model):

FreeTAKServer/components/extended/companion_parrot/controllers/companion_parrot_general_controller.py

@@ -2,7 +2,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 class CompanionParrotGeneralController(Controller):
 	def __init__(

FreeTAKServer/components/extended/companion_parrot/controllers/companion_parrot_sender_controller.py

@@ -4,7 +4,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 
 class CompanionParrotSenderController(Controller):

FreeTAKServer/components/extended/companion_parrot/domain/_event.py

@@ -1,4 +1,4 @@
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 import uuid
 from datetime import datetime as dt
 from FreeTAKServer.components.core.abstract_component.cot_node import CoTNode

FreeTAKServer/components/extended/cotmanager/controllers/cotmanager_general_controller.py

@@ -2,7 +2,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 
 class COTManagerGeneralController(Controller):

FreeTAKServer/components/extended/cotmanager/controllers/cotmanager_sender_controller.py

@@ -4,7 +4,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 
 class COTManagerSenderController(Controller):

FreeTAKServer/components/extended/cotmanager/domain/_event.py

@@ -1,4 +1,4 @@
-from digitalpy.core.parsing.load_configuration import Configuration
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration
 import uuid
 from datetime import datetime as dt
 from FreeTAKServer.components.core.abstract_component.cot_node import CoTNode

FreeTAKServer/components/extended/emergency/configuration/manifest.ini

@@ -19,3 +19,4 @@ url="https://github.com/FreeTAKTeam/FreeTakServer"
 repo = https://pypi.org/project/FreeTAKServer/
 ; software license for this component
 license = EPL
+dependencies = type

FreeTAKServer/components/extended/emergency/controllers/emergency_general_controller.py

@@ -2,7 +2,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 from ..configuration.emergency_constants import (
     DEST_SCHEMA,
     DEST_CLASS,

FreeTAKServer/components/extended/emergency/controllers/emergency_on_controller.py

@@ -9,7 +9,7 @@
     DefaultBusinessRuleController,
 )
 from digitalpy.core.telemetry.tracer import Tracer
-from digitalpy.core.parsing.load_configuration import Configuration, ConfigurationEntry
+from digitalpy.core.parsing.load_configuration import ModelConfiguration as Configuration, ConfigurationEntry
 
 from FreeTAKServer.components.core.domain.domain._event import Event
 from ..domain import emergency

FreeTAKServer/components/extended/emergency/controllers/emergency_sender_controller.py

@@ -3,7 +3,7 @@
 from digitalpy.core.zmanager.request import Request
 from digitalpy.core.zmanager.response import Response
 from digitalpy.core.zmanager.action_mapper import ActionMapper
-from digitalpy.core.digipy_configuration.configuration import Configuration
+from digitalpy.core.digipy_configuration.domain.model.configuration import Configuration
 
 from .emergency_general_controller import EmergencyGeneralController
 from ..configuration.emergency_constants import (

FreeTAKServer/components/extended/excheck/configuration/manifest.ini

@@ -20,4 +20,4 @@ repo = https://pypi.org/project/FreeTAKServer/
 ; software license for this component
 license = EPL
 ; dependencies
-dependencies = mission
+dependencies = mission,enterprise_sync