Skip to content

Parser #270

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
adeas31 merged 12 commits into from
May 3, 2025
Merged

Parser #270

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
103237a
[OMParser] use a single entry point for OMParser
syntron Apr 24, 2025
36a54f0
[OMTypedParser] use a single entry point for OMTypedParser
syntron Apr 24, 2025
7f74995
[OMCSessionBase] fix exception handling for pyparsing.ParseException
syntron Apr 24, 2025
12edd0d
[OMCSessionBase] simplify the two use cases of OMParser.om_parse_basic()
syntron Apr 24, 2025
8ad5efa
Merge remote-tracking branch 'origin' into parser
adeas31 Apr 28, 2025
fbd5c50
Return unchanged result from `_ask_with_fallback`
adeas31 Apr 29, 2025
2f93ad3
[OMParser] use a single entry point for OMParser
syntron Apr 24, 2025
7c5be8c
[OMTypedParser] use a single entry point for OMTypedParser
syntron Apr 24, 2025
e0bc792
[OMCSessionBase] fix exception handling for pyparsing.ParseException
syntron Apr 24, 2025
a906365
[OMCSessionBase] simplify the two use cases of OMParser.om_parse_basic()
syntron Apr 24, 2025
6cfe458
Merge branch 'parser' of https://github.com/syntron/OMPython into parser
adeas31 Apr 30, 2025
6a6b501
Do not strip the result
adeas31 Apr 30, 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
Prev Previous commit
Next Next commit
[OMCSessionBase] simplify the two use cases of OMParser.om_parse_basic()
  • Loading branch information
@syntron
syntron committed Apr 25, 2025
commit 12edd0d03872e44a9ff98d3945ff1c12fe61997c
46 changes: 22 additions & 24 deletions OMPython/OMCSession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,24 @@ def ask(self, question, opt=None, parsed=True):

return res

def _ask_with_fallback(self, question: str, opt: str = None):
"""
Version of ask() with OMTypedParser as fallback for OMParser which is used in ask() => sendExpression() if
parsed is set to True.
"""
try:
# FIXME: OMPython exception UnboundLocalError exception for 'Modelica.Fluid.Machines.ControlledPump'
return self.ask(question=question, opt=opt)
except pyparsing.ParseException as ex:
logger.warning('OMTypedParser error: %s', ex.msg)
result = self.ask(question=question, opt=opt, parsed=False)
try:
answer = om_parser_basic(result)
return answer[2:]
except (TypeError, UnboundLocalError) as ex:
logger.warning('OMParser error: %s', ex)
return result

# TODO: Open Modelica Compiler API functions. Would be nice to generate these.
def loadFile(self, filename):
return self.ask('loadFile', f'"{filename}"')
Expand Down Expand Up @@ -236,35 +254,15 @@ def getComponentModifierNames(self, className, componentName):
return self.ask('getComponentModifierNames', f'{className}, {componentName}')

def getComponentModifierValue(self, className, componentName):
try:
# FIXME: OMPython exception UnboundLocalError exception for 'Modelica.Fluid.Machines.ControlledPump'
return self.ask('getComponentModifierValue', f'{className}, {componentName}')
except pyparsing.ParseException as ex:
logger.warning('OMTypedParser error: %s', ex.msg)
result = self.ask('getComponentModifierValue', f'{className}, {componentName}', parsed=False)
try:
answer = om_parser_basic(result)
return answer[2:]
except (TypeError, UnboundLocalError) as ex:
logger.warning('OMParser error: %s', ex)
return result
return self._ask_with_fallback(question='getComponentModifierValue',
opt=f'{className}, {componentName}')

def getExtendsModifierNames(self, className, componentName):
return self.ask('getExtendsModifierNames', f'{className}, {componentName}')

def getExtendsModifierValue(self, className, extendsName, modifierName):
try:
# FIXME: OMPython exception UnboundLocalError exception for 'Modelica.Fluid.Machines.ControlledPump'
return self.ask('getExtendsModifierValue', f'{className}, {extendsName}, {modifierName}')
except pyparsing.ParseException as ex:
logger.warning('OMTypedParser error: %s', ex.msg)
result = self.ask('getExtendsModifierValue', f'{className}, {extendsName}, {modifierName}', parsed=False)
try:
answer = om_parser_basic(result)
return answer[2:]
except (TypeError, UnboundLocalError) as ex:
logger.warning('OMParser error: %s', ex)
return result
return self._ask_with_fallback(question='getExtendsModifierValue',
opt=f'{className}, {extendsName}, {modifierName}')

def getNthComponentModification(self, className, comp_id):
# FIXME: OMPython exception Results KeyError exception
Expand Down