<API Update>[Ogl]: <description>

[
* Bump our version
* Bump to new Ogl Version
* Don't use pyutObject, use pyutSDInstance
]

[#83]

Author: hasii2011

requirements.txt

@@ -7,6 +7,8 @@ html-testRunner~=1.2.1
 buildlackey==1.7.0
 
 mypy==1.13.0
+mypy-extensions>=1.0.0
+typing_extensions==4.12.2
 
 untangle==1.2.1
 wxPython==4.2.2
@@ -15,4 +17,4 @@ codeallybasic>=1.7.0
 codeallyadvanced>=1.3.2
 
 pyutmodelv2==2.2.0
-ogl>=3.1.0
+ogl>=3.5.0

src/untanglepyut/BaseUnTangle.py

@@ -5,6 +5,7 @@
 from miniogl.models.ShapeModel import ShapeModel
 
 from ogl.OglObject import OglObject
+from ogl.sd.OglSDInstance import OglSDInstance
 
 from untanglepyut.Types import GraphicInformation
 
@@ -20,7 +21,7 @@ def __init__(self, xmlVersion: XmlVersion):
 
         self._xmlVersion = xmlVersion
 
-    def _updateModel(self, oglObject: OglObject, graphicInformation: GraphicInformation) -> ShapeModel:
+    def _updateModel(self, oglObject: OglObject | OglSDInstance, graphicInformation: GraphicInformation) -> ShapeModel:
         """
         This is necessary if it is never added to a diagram
         and immediately serialized

src/untanglepyut/UnTangleSequenceDiagram.py

@@ -95,17 +95,11 @@ def _untangleSDMessages(self, pyutDocument: Element) -> OglSDMessages:
             srcInstance: OglSDInstance = self._oglSDInstances[bogus.sourceId]
             dstInstance: OglSDInstance = self._oglSDInstances[bogus.destinationId]
 
-            # pyutSDMessage.setSource(srcInstance.pyutObject)          # Ugh, time was set by sdMessageToPyutSDMessage
-            # pyutSDMessage.setDestination(dstInstance.pyutObject)     # This "split" functionality must be fixed
-            pyutSDMessage.source      = srcInstance.pyutObject         # Ugh, time was set by sdMessageToPyutSDMessage
-            pyutSDMessage.destination = dstInstance.pyutObject         # This "split" functionality must be fixed
+            pyutSDMessage.source      = srcInstance.pyutSDInstance         # Ugh, time was set by sdMessageToPyutSDMessage
+            pyutSDMessage.destination = dstInstance.pyutSDInstance         # This "split" functionality must be fixed
 
             oglSDMessage: OglSDMessage = OglSDMessage(srcSDInstance=srcInstance, pyutSDMessage=pyutSDMessage, dstSDInstance=dstInstance)
 
-            # This is done by the constructor above
-            # srcInstance.addLink(link=oglSDMessage)
-            # dstInstance.addLink(link=oglSDMessage)
-
             oglSDMessages[pyutSDMessage.id] = oglSDMessage
 
         return oglSDMessages

src/untanglepyut/_version.py

@@ -1 +1 @@
-__version__: str = '2.5.0'
+__version__: str = '2.6.0'

tests/untanglepyut/v10/TestUnTangleSequenceDiagram.py

@@ -41,16 +41,6 @@ def testSimpleSequenceDiagram(self):
         document: Document = self._retrieveSequenceDiagramDocument()
         self.assertEqual('SEQUENCE_DIAGRAM', document.documentType, 'Incorrect document type')
 
-    def testSequenceInstances(self):
-        document: Document = self._retrieveSequenceDiagramDocument()
-
-        oglSDInstances: OglSDInstances = document.oglSDInstances
-        self.assertEqual(2, len(oglSDInstances), 'Bad # of instances')
-
-        expectedInstanceNames: List[str] = ['Instance1', 'Instance2']
-        for oglSDInstance in oglSDInstances.values():
-            self.assertIn(oglSDInstance.instanceName.text, expectedInstanceNames, 'Not an expected instance')
-
     def testSequenceMessages(self):
         document: Document = self._retrieveSequenceDiagramDocument()
 

tests/untanglepyut/v11/TestUnTangleSequenceDiagram.py

@@ -81,8 +81,8 @@ def testOglSdInstance(self):
 
         oglSDInstance: OglSDInstance = oglSDInstances[3]
 
-        self.assertEqual('OzzeeInstance', oglSDInstance.pyutObject.instanceName, 'Incorrect instance name')
-        self.assertEqual(200, oglSDInstance.pyutObject.instanceLifeLineLength,           '')
+        self.assertEqual('OzzeeInstance', oglSDInstance.pyutSDInstance.instanceName, 'Incorrect instance name')
+        self.assertEqual(200, oglSDInstance.pyutSDInstance.instanceLifeLineLength,           '')
 
     def testOnlySingleLinksCreated(self):
 
@@ -92,13 +92,13 @@ def testOnlySingleLinksCreated(self):
 
         for sdInstance in oglSDInstances.values():
             oglSDInstance: OglSDInstance = cast(OglSDInstance, sdInstance)
-            instanceName: str = oglSDInstance.pyutObject.instanceName
+            instanceName: str = oglSDInstance.pyutSDInstance.instanceName
             if instanceName == 'hasiiInstance':
-                self.assertEqual(1, len(oglSDInstance.links), f'`{instanceName}` Should have a single message')
+                self.assertEqual(1, len(oglSDInstance.messages), f'`{instanceName}` Should have a single message')
             elif instanceName == 'franInstance':
-                self.assertEqual(3, len(oglSDInstance.links), f'`{instanceName}` Should have a single message')
+                self.assertEqual(3, len(oglSDInstance.messages), f'`{instanceName}` Should have a single message')
             elif instanceName == 'OzzeeInstance':
-                self.assertEqual(2, len(oglSDInstance.links), f'`{instanceName}` Should have a single message')
+                self.assertEqual(2, len(oglSDInstance.messages), f'`{instanceName}` Should have a single message')
 
     def _untangleSequenceDiagramDocument(self) -> UnTangleSequenceDiagram: