RS2Scripting 11.23.0.dev1__tar.gz → 11.23.0.dev3__tar.gz

{RS2Scripting-11.23.0.dev1/src/RS2Scripting.egg-info → RS2Scripting-11.23.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RS2Scripting
-Version: 11.23.0.dev1
+Version: 11.23.0.dev3
 Summary: Client library for interacting with RS2 through python
 Author: Rocscience
 License: MIT License

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "RS2Scripting"
-version = "11.23.0.dev1"
+version = "11.23.0.dev3"
 dependencies = [
   "rsmessages == 0.0.2.dev1"
 ]

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3/src/RS2Scripting.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RS2Scripting
-Version: 11.23.0.dev1
+Version: 11.23.0.dev3
 Summary: Client library for interacting with RS2 through python
 Author: Rocscience
 License: MIT License

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/RS2Scripting.egg-info/SOURCES.txt

@@ -17,7 +17,7 @@ src/rs2/interpreter/CompositeResult.py
 src/rs2/interpreter/HistoryQueryResults.py
 src/rs2/interpreter/InterpreterEnums.py
 src/rs2/interpreter/InterpreterGraphEnums.py
-src/rs2/interpreter/InterpreterModelProxy.py
+src/rs2/interpreter/InterpreterModel.py
 src/rs2/interpreter/JointResult.py
 src/rs2/interpreter/LinerResult.py
 src/rs2/interpreter/MaterialQueryResults.py
@@ -26,7 +26,7 @@ src/rs2/interpreter/RS2Interpreter.py
 src/rs2/interpreter/TimeQueryResults.py
 src/rs2/interpreter/UtilityResult.py
 src/rs2/interpreter/__init__.py
-src/rs2/modeler/ModelProxy.py
+src/rs2/modeler/Model.py
 src/rs2/modeler/RS2Modeler.py
 src/rs2/modeler/__init__.py
 src/rs2/modeler/properties/AbsoluteStageFactorGettersInterface.py
@@ -37,7 +37,7 @@ src/rs2/modeler/properties/MaterialJoint.py
 src/rs2/modeler/properties/MaterialJointOptions.py
 src/rs2/modeler/properties/PropertyEnums.py
 src/rs2/modeler/properties/RelativeStageFactorInterface.py
-src/rs2/modeler/properties/ShearNormalFunctionProxy.py
+src/rs2/modeler/properties/ShearNormalFunction.py
 src/rs2/modeler/properties/SnowdenAnisotropicFunction.py
 src/rs2/modeler/properties/StructuralInterface.py
 src/rs2/modeler/properties/UserDefinedWaterMode.py
@@ -69,7 +69,7 @@ src/rs2/modeler/properties/liner/ReinforcedConcrete.py
 src/rs2/modeler/properties/liner/StandardBeam.py
 src/rs2/modeler/properties/liner/__init__.py
 src/rs2/modeler/properties/material/InitialConditions.py
-src/rs2/modeler/properties/material/MaterialPropertyProxy.py
+src/rs2/modeler/properties/material/MaterialProperty.py
 src/rs2/modeler/properties/material/StageFactors.py
 src/rs2/modeler/properties/material/__init__.py
 src/rs2/modeler/properties/material/datum/BaseDatum.py

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/rs2/interpreter/BoltResult.py

@@ -32,7 +32,7 @@ class BoltForceDisplacementResult:
         ResetInvalid.validate(self)
 
 class BoltResult:
-    def __init__(self, entity_id, entity_data, yielding_results, force_displacement_results):
+    def __init__(self, entity_id, entity_data, yielding_results: BoltYieldingResult, force_displacement_results: BoltForceDisplacementResult):
         if len(entity_data) == 0 or len(entity_data[0]) == 0:
             assert False, 'location not defined'
             return
@@ -44,6 +44,6 @@ class BoltResult:
         self.start_y = start_y
         self.end_x = end_x
         self.end_y = end_y
-        self.yielding_results = yielding_results
-        self.force_displacement_results = force_displacement_results
+        self.yielding_results: BoltYieldingResult = yielding_results
+        self.force_displacement_results: BoltForceDisplacementResult = force_displacement_results
 

RS2Scripting-11.23.0.dev3/src/rs2/interpreter/CompositeResult.py

@@ -0,0 +1,24 @@
+from rs2.interpreter.LinerResult import LinerResult
+from rs2.interpreter.JointResult import JointResult
+
+class PileResult:
+    def __init__(self, entity_id, joint_result: JointResult, liner_result: LinerResult):
+        self.entity_id = entity_id
+        self.joint_result: JointResult = joint_result
+        self.liner_result: LinerResult = liner_result
+
+class CompositeResult:
+    def __init__(self, entity_id, joint_result: JointResult, liner_result: LinerResult):
+        self.entity_id = entity_id
+        self.joint_result: JointResult = joint_result
+        self.liner_result: LinerResult = liner_result
+
+class StructuralResult:
+    def __init__(self, entity_id, joint_result: JointResult, liner_result: LinerResult):
+        self.entity_id = entity_id
+        self.joint_result: JointResult = joint_result
+        self.liner_result: LinerResult = liner_result
+
+
+
+

RS2Scripting-11.23.0.dev1/src/rs2/interpreter/InterpreterModelProxy.py → RS2Scripting-11.23.0.dev3/src/rs2/interpreter/InterpreterModel.py

@@ -11,7 +11,7 @@ from rs2.interpreter.LinerResult import *
 from rs2.interpreter.BoltResult import*
 from rs2.interpreter.CompositeResult import*
 from rs2.interpreter.MaterialQueryResults import *
-class ModelProxy(ProxyObject):
+class Model(ProxyObject):
 	"""
 	:ref:`Model Example`
 	"""
@@ -25,7 +25,10 @@ class ModelProxy(ProxyObject):
 
 	def close(self):
 		'''
-		Closes the model
+		:ref:`Model Example`
+
+		|  Closes the model
+		
 		'''
 		return self._callFunction('close', [])
 
@@ -44,23 +47,26 @@ class ModelProxy(ProxyObject):
 
 	def save(self):
 		'''
-		Saves the model
+		:ref:`Model Example`
+
+		|  Saves the model
+
 		'''
 		return self._callFunction('save', [])
 	
 	def SetActiveStage(self, stageNumber: int):
 		'''
-		Change model's active stage by its stage number
+		:ref:`Material Query Example`
+
+		|  Change model's active stage by its stage number
 		'''
 		return self._callFunction('SetActiveStage', [stageNumber])
 	
 	def SetResultType(self, resultType: ExportResultType) -> list[dict]:
 		"""
-		Sets the export result type for the model.
+		:ref:`Get Mesh Results Example`
 
-		Args:
-			resultType (ExportResultType): Takes an enum of type ExportResultType representing the desired
-				export option for mesh results.
+		|  Sets the export result type for your model.
 		
 		Raises:
 			ValueError: resultType must be an enum of type ExportResultType. Any other value will raise an error
@@ -70,33 +76,16 @@ class ModelProxy(ProxyObject):
 	
 	def SetUserDefinedResultType(self, resultName: str) -> list[dict]:
 		"""
-		Sets the export result type to the user defined result type name.
-
-		Args:
-			resultName (str): Takes the name of the user defined export option to generate mesh results for.
+		|  Sets the export result type to the user defined result type name.
 		
 		"""
 		return self._callFunction('SetUserDefinedResultType', [resultName])
 	
 	def GetMeshResults(self) -> MeshResults:
 		"""
-		Returns the mesh results at all nodes of the model.
-
-		Returns:
-			|  An object of type MeshResults. To extract the x-coordinate, y-coordinate or value from the returned data, 
-			|  please call the supported functions from the class:
-			|  MeshResults.GetXCoordinate(index)
-			|  MeshResults.GetYCoordinate(index)
-			|  MeshResults.GetValue(index)
-				
-		Example:
-
-		.. code-block:: python
+		:ref:`Get Mesh Results Example`
 
-			results = model.GetMeshResults()
-			x_coordiante = results.GetXCoordinate(0)
-			y_coordinate = results.GetYCoordinate(0)
-			value = results.GetValue(0)
+		|  Returns the mesh results at all nodes for your model.
 		
 		"""
 		results = self._callFunction('GetMeshResults', [])
@@ -105,38 +94,14 @@ class ModelProxy(ProxyObject):
 	def GetHistoryQueryResults(self, hq_name: str, horizontal_axis: HistoryQueryGraphEnums.HorizontalAxisTypes, vertical_axis: HistoryQueryGraphEnums.VerticalAxisTypes, 
 							stages: list[int]) -> dict[int, list[HistoryQueryResult]]:
 		"""
-		Returns the history query result for the provided query name with specified graph options and stages.
+		:ref:`History Query Example`
 
-		Args:
-			hq_name (str): Takes the name of the History Query Point.
-			horizontal_axis (HistoryQueryGraphEnums): Takes the horizontal axis to generate results for.
-			vertical_axis (HistoryQueryGraphEnums): Takes the vertical axis to generate results for.
-			stages (int): Takes the stages by their stage number for which results should be returned.
-		
-		Returns:
-			|  Returns a dictionary with key as stage number and value a List of HistoryQueryResult object.
-			|  To extract the stage number, x-coordinate, y-coordinate, horizontal axis result and vertical axis result,
-			|  please call the supported functions from the class:
-
-			* GetXCoordinate()
-			* GetYCoordinate()
-			* GetHorizontalAxisResult()
-			* GetVerticalAxisResult()
-		
-		Example:
-
-		.. code-block:: python
-
-			results = model.GetHistoryQueryResults(params)
-			results_for_stage_1 = results[1]
-			x_coordiante = results_for_stage_1[0].GetXCoordinate()
-			y_coordinate = results_for_stage_1[0].GetYCoordinate()
-			horizontal_result = results_for_stage_1[0].GetHorizontalResult()
-			vertical_result = results_for_stage_1[0].GetVerticalResult()
+		|   Returns a map of HistoryQueryResult for all input stages and history queries in your model.
 		
 		Raises:
 			ValueError: horizontal_axis and vertical_axis must be an enum of type HistoryQueryGraphEnums.
 						Any other value will raise an error.
+
 		"""
 		map_data = self._callFunction('GetHistoryQueryResults', [hq_name, horizontal_axis.value, vertical_axis.value, stages])
 		structured_data = {}
@@ -153,35 +118,15 @@ class ModelProxy(ProxyObject):
 							  vertical_axis: TimeQueryGraphEnums.VerticalAxisTypes
 							  ) -> dict[int, list[TimeQueryPointResults]]:
 		"""
-		Returns the results for all the time query points defined in the model for given stages and graph axes type.
-
-		Please note points that are over an excavation at specific stages will not have data returned at those locations.
+		:ref:`Time Query Example`
 
-		Args:
-			stages (list[int]): Takes the stages by their stage number for which results should be returned.
-			vertical_axis (TimeQueryGraphEnums): Takes the vertical axis to generate results for.
-		
-		Returns:
-			| Returns a dictionary with key as stage number and value a list[TimeQueryPointResults] object.
-			| To extract the unique identifier, x-coordinate, y-coordinate, horizontal axis result and vertical axis result,
-			| please call the supported functions from the class:
-
-			* TimeQueryPointResults.GetUniqueIdentifier()
-			
-			To get all the results for this query, please call:
+		|  Returns a map of TimeQueryPointResults for all input stages and time query points in your model.
 
-			* TimeQueryPointResults.GetAllValues()
-		
-		The above method returns list[QueryPointResult] for each node. 
-		To get the x-coordiante, y-coordinate, dynamic stage time or value, please call:
-		
-		* QueryPointResult.GetXCoordinate()
-		* QueryPointResult.GetYCoordinate()
-		* QueryPointResult.GetStageTime()
-		* QueryPointResult.GetValue()
+		|  Please note points that are over an excavation at specific stages will not have data returned at those locations.
 		
 		Raises:
 			ValueError: vertical_axis must be an enum of type TimeQueryGraphEnums. Any other value will raise an error.
+
 		"""
 		map_data = self._callFunction('GetAllTimeQueryPointsResults', 
 							 [stages, vertical_axis.value])
@@ -202,37 +147,15 @@ class ModelProxy(ProxyObject):
 							  apply_post_process_scaling: bool
 							  ) -> dict[int, list[TimeQueryLineResults]]:
 		"""
-		Returns the results for all the time query lines defined in the model for given stages and graph axes types.
+		:ref:`Time Query Example`
 
-		Please note points that are over an excavation at specific stages will not have data returned at those locations.
+		|  Returns a map of TimeQueryLineResults for all input stages and time query lines in your model.
 
-		Args:
-			stages (list[int]): Takes the stages by their stage number for which results should be returned.
-			vertical_axis (TimeQueryGraphEnums): Takes the vertical axis to generate results for.
-			apply_post_process_scaling (bool): Bool input taking whether post-process scaling should be applied or not
-		
-		Returns:
-			|  Returns a dictionary with key as stage number and value a list[TimeQueryLineResults] object.
-			|  To extract the unique identifier, or list[QueryLineResult] representing all node objects for this query line,
-			|  please call the supported functions from the class:
-
-			* TimeQueryLineResults.GetUniqueIdentifier()
-			* TimeQueryLineResults.GetAllNodeObjects()
-
-			|  To get list[QueryPointResult] denoting all the node objects at a specific node of time query line, please call:
-
-			* QueryLineResult.GetNodeValues()
-
-			|  The above method returns list[QueryPointResult] representing all the values at this node of the time query line. 
-			|  To get the x-coordiante, y-coordinate, dynamic stage time or value, please call:
-
-			* QueryPointResult.GetXCoordinate()
-			* QueryPointResult.GetYCoordinate()
-			* QueryPointResult.GetStageTime()
-			* QueryPointResult.GetValue()
+		|  Please note points that are over an excavation at specific stages will not have data returned at those locations.
 		
 		Raises:
 			ValueError: vertical_axis must be an enum of type TimeQueryGraphEnums. Any other value will raise an error.
+
 		"""
 		map_data =  self._callFunction('GetAllTimeQueryLinesResults', 
 							 [stages, vertical_axis.value, apply_post_process_scaling])
@@ -249,49 +172,36 @@ class ModelProxy(ProxyObject):
 		return structured_data	
 	
 	def AddMaterialQuery(self, points: list[list[float]]) -> str:
-		"""Adds a material query point/line to your model using the specified coordinates in order.
+		"""
+		:ref:`Material Query Example`
+
+		|  Adds a material query point/line to your model using the specified coordinates in order.
 
-		Returns:
-			A unique identifier for the newly added material query point/line.
+		|  Returns a unique identifier for the newly added material query point/line.
 		
 		"""
 		return self._callFunction('AddMaterialQuery', [points])
 	
 	def RemoveMaterialQuery(self, IDs_toRemove: list[str]) -> str:
-		"""Removes material query points or lines for provided list of IDs."""
+		"""
+		:ref:`Material Query Example`
+
+		|  Removes material query points or lines for provided list of IDs.
+
+		"""
 		return self._callFunction('RemoveMaterialQuery', [IDs_toRemove])
 	
 	def GetMaterialQueryResults(self) -> list[MaterialQueryResults]:
 		"""
+		:ref:`Material Query Example`
 		
-		|  Returns the results for all the material queries defined in the model for active model stage and result type.
+		|  Returns the results for all the material queries defined in your model for active model stage and result type.
 		|  To get results for a different stage, please call SetActiveStage(int stageNumber) before calling this function.
 		|  To get results for a different result type, please call either before calling this function:
 
 		* SetResultType(InterpreterGraphEnums resultType)
 		* SetUserDefinedResultType("Your defined resultType name")
 
-		Returns: 
-			|  A list[MaterialQueryResults] of query results.
-			|  To extract the Unique Identifier, Material ID for a specific material query object,
-
-			please call any of the supported functions from the class:
-
-			* MaterialQueryResults.GetUniqueIdentifier()
-			* MaterialQueryResults.GetMaterialID()
-
-			|  To get all the results for this query, please call:
-
-			* MaterialQueryResults.GetAllValues()
-
-			|  The above method returns list[QueryResult] for each result. 
-			|  To get the x-coordiante, y-coordinate, distance or value, please call:
-
-			* QueryResult.GetXCoordinate()
-			* QueryResult.GetYCoordinate()
-			* QueryResult.GetDistance()
-			* QueryResult.GetValue()
-
 		"""
 		all_material_query_data = self._callFunction('GetMaterialQueryResults', [])
 		all_mat_query_data_as_classObj = []
@@ -302,12 +212,13 @@ class ModelProxy(ProxyObject):
 			all_mat_query_data_as_classObj.append(MaterialQueryResults(*unpack_list_data))
 		return all_mat_query_data_as_classObj
 
-	
+	def GetBoltResults (self, stages: list[int]) -> dict[int, list[BoltResult]]:
+		"""
+		:ref:`Support Bolt Results Example`
 		
+		|  Returns a map of BoltResult for all input stages and support bolt defined in your model.
 
-	def GetBoltResults (
-		self, 
-		stages: list[int]) -> dict[int, list[BoltResult]]:
+		"""
 		map_data = self._callFunction('GetBoltResults', [stages])
 		structured_data = {}
 		for stage_idx, stage_data in map_data.items():
@@ -320,7 +231,8 @@ class ModelProxy(ProxyObject):
 				# displacement force
 				if len(entity_data) < 3 or len(entity_data[0]) <1 or len(entity_data[0][0]) < 4:
 					continue
-
+				if len(entity_data[1]) < 1 or len(entity_data[2]) < 1:
+					continue
 				for yeilding_vector in entity_data[1]:
 					yielding = BoltYieldingResult(*yeilding_vector)
 					yielding_results.append(yielding)
@@ -332,7 +244,7 @@ class ModelProxy(ProxyObject):
 				structured_data[stage_idx].append(bolt_result)
 		return structured_data
 		
-	def process_joint_data(self, entity_data, entity_name):
+	def _process_joint_data(self, entity_data, entity_name):
 
 		joint_element_results = []
 		for joint_vector in entity_data[1]:
@@ -342,7 +254,7 @@ class ModelProxy(ProxyObject):
 		joint_result = JointResult(entity_name, joint_element_results)
 		return joint_result
 
-	def process_liner_data(self, entity_data, entity_name):
+	def _process_liner_data(self, entity_data, entity_name):
 		liner_element_results = []
 
 		for liner_vector in entity_data[0]:
@@ -351,52 +263,68 @@ class ModelProxy(ProxyObject):
 		liner_result = LinerResult(entity_name,liner_element_results)
 		return liner_result
 
-	def GetJointResults(
-		self, 
-		stages: list[int]) -> dict[int, list[JointResult]]:
+	def GetJointResults(self, stages: list[int]) -> dict[int, list[JointResult]]:
+		"""
+		:ref:`Support Joint Results Example`
+		
+		|  Returns a map of JointResult for all input stages and support joint defined in your model.
 
+		"""
 		map_data = self._callFunction('GetJointResults', [stages])
 		structured_data = {}
 		for stage_idx, stage_data in map_data.items():
 
 			structured_data[stage_idx] = []
 			for entity_name, entity_data in stage_data.items():
-				joint_result = self.process_joint_data(entity_data, entity_name)
+				joint_result = self._process_joint_data(entity_data, entity_name)
 				structured_data[stage_idx].append(joint_result)
 		
 		return structured_data
 	
-	def GetLinerResults(
-		self, 
-		stages: list[int]) -> dict[int, list[LinerResult]]:
+	def GetLinerResults(self, stages: list[int]) -> dict[int, list[LinerResult]]:
+		"""
+		:ref:`Support Liner Results Example`
+		
+		|  Returns a map of LinerResult for all input stages and support liner defined in your model.
 
+		"""
 		map_data = self._callFunction('GetLinerResults', [stages])
 		structured_data = {}
 		for stage_idx, stage_data in map_data.items():
 
 			structured_data[stage_idx] = []
 			for entity_name, entity_data in stage_data.items():
-				liner_result = self.process_liner_data(entity_data, entity_name)
+				liner_result = self._process_liner_data(entity_data, entity_name)
 				structured_data[stage_idx].append(liner_result)
 		
 		return structured_data
 
+	def GetPileResults(self, stages: list[int]) -> dict[int, list[PileResult]]:
+		"""
+		:ref:`Support Pile Results Example`
+		
+		|  Returns a map of PileResult for all input stages and support pile defined in your model.
 
-	def GetPileResults(	
-		self, 
-		stages: list[int]) -> dict[int, list[PileResult]]:
+		"""
 		return self._get_composition_result('GetPileResults',PileResult, stages)
 
-	def GetCompositeResults(	
-		self, 
-		stages: list[int]) -> dict[int, list[CompositeResult]]:
+	def GetCompositeResults(self, stages: list[int]) -> dict[int, list[CompositeResult]]:
+		"""
+		:ref:`Support Composite Results Example`
+		
+		|  Returns a map of CompositeResult for all input stages and support composite defined in your model.
+
+		"""
 		return self._get_composition_result('GetCompositeResults',CompositeResult, stages)
 
-	def GetStructuralResults(	
-		self, 
-		stages: list[int]) -> dict[int, list[PileResult]]:
-		return self._get_composition_result('GetStructuralResults',StructuralResult, stages)
+	def GetStructuralResults(self, stages: list[int]) -> dict[int, list[StructuralResult]]:
+		"""
+		:ref:`Support Structural Results Example`
+		
+		|  Returns a map of StructuralResult for all input stages and support structural defined in your model.
 
+		"""
+		return self._get_composition_result('GetStructuralResults',StructuralResult, stages)
 
 	def _get_composition_result(
 	self,
@@ -409,16 +337,19 @@ class ModelProxy(ProxyObject):
 		for stage_idx, stage_data in map_data.items():
 			structured_data[stage_idx] = []
 			for entity_name, entity_data in stage_data.items():
-				liner_result = self.process_liner_data(entity_data, entity_name)
-				joint_result = self.process_joint_data(entity_data, entity_name)
+				liner_result = self._process_liner_data(entity_data, entity_name)
+				joint_result = self._process_joint_data(entity_data, entity_name)
 				composition_result = ResultType(entity_name,joint_result,liner_result)
 				structured_data[stage_idx].append(composition_result)
 
 		return structured_data
 
-	def getUnits(self):
+	def getUnits(self) -> Units:
 		'''
-		Get Units
+		:ref:`Get Model Units Example`
+
+		|  Get Solid, Hydro and Thermal units for your model
+		
 		'''
 		NUM_UNITS = 3
 		data = self._callFunction('getUnits', [])
@@ -429,6 +360,6 @@ class ModelProxy(ProxyObject):
 
 	def getCriticalSRF(self):
 		'''
-		Get Critical SRF
+		|  Get Critical SRF
 		'''
 		return ResetInvalid.validate_double(self._callFunction('getCriticalSRF', []))

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/rs2/interpreter/JointResult.py

@@ -16,9 +16,9 @@ class JointElementResult:
         ResetInvalid.validate(self)
 
 class JointResult:
-    def __init__(self, entity_id, joint_element_results):
+    def __init__(self, entity_id, joint_element_results: JointElementResult):
         self.entity_id = entity_id
-        self.joint_element_results = joint_element_results
+        self.joint_element_results: JointElementResult = joint_element_results
 
 
 

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/rs2/interpreter/LinerResult.py

@@ -28,6 +28,6 @@ class LinerElementResult:
         ResetInvalid.validate(self)
 
 class LinerResult:
-    def __init__(self, entity_id, liner_element_results):
+    def __init__(self, entity_id, liner_element_results: LinerElementResult):
         self.entity_id = entity_id
-        self.liner_element_results = liner_element_results
+        self.liner_element_results: LinerElementResult = liner_element_results

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/rs2/interpreter/MeshResults.py

@@ -6,7 +6,7 @@ class MeshResults:
 
     def getXCoordinate(self, index):
         return self.results[index][0]
-    def getYCoordiante(self, index):
+    def getYCoordinate(self, index):
         return self.results[index][1]
     def getValue(self, index):
         return self.results[index][2]

{RS2Scripting-11.23.0.dev1 → RS2Scripting-11.23.0.dev3}/src/rs2/interpreter/RS2Interpreter.py

@@ -1,7 +1,7 @@
 from rsmessages.requestFormat import functionRequest
 from rs2._common.Client import Client
 from rs2.utilities.ApplicationManager import ApplicationManager
-from rs2.interpreter.InterpreterModelProxy import ModelProxy
+from rs2.interpreter.InterpreterModel import Model
 import winreg
 import time
 
@@ -9,7 +9,7 @@ class RS2Interpreter:
 	def __init__(self, host = 'localhost', port=60055):
 		self.client = Client(host, port)
 
-	def openFile(self, fileName : str) -> ModelProxy:
+	def openFile(self, fileName : str) -> Model:
 		'''
 		Takes in the absolute path to an rs2 file to be opened in the modeler.
 
@@ -21,8 +21,8 @@ class RS2Interpreter:
 		'''
 		request = functionRequest('open_file', [fileName], keepReturnValueReference=True)
 		modelObjectId = self.client.callFunction(request)
-		modelProxy = ModelProxy(self.client, modelObjectId)
-		return modelProxy
+		model = Model(self.client, modelObjectId)
+		return model
 	
 	@classmethod
 	def startApplication(cls, port : int, overridePathToExecutable : str = None, timeout : float = 30) -> None: