pyDMNrules-enhanced 1.5.0__tar.gz → 1.6.0__tar.gz

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/LICENSE_MCP

@@ -20,3 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/MANIFEST.in

@@ -6,3 +6,4 @@ include requirements_mcp.txt
 include claude_desktop_config.json
 recursive-include pydmnrules_mcp *.py
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/MCP_PROJECT_SUMMARY.md

@@ -397,3 +397,4 @@ pyDMNrules MCP Server는 DMN XML 규칙을 LLM이 쉽게 사용할 수 있도록
 **엔진**: pyDMNrules  
 **프레임워크**: FastMCP
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pyDMNrules-enhanced
-Version: 1.5.0
-Summary: Enhanced pyDMNrules with full decision dependency support (<informationRequirement>)
+Version: 1.6.0
+Summary: Enhanced pyDMNrules with full DRD support (informationRequirement/requiredInput auto-mapping)
 Home-page: https://github.com/uengine/pyDMNrules
 Author: Russell McDonell (Enhanced by uengine)
 Author-email: russell.mcdonell@c-cost.com
@@ -16,16 +16,6 @@ Requires-Dist: datetime
 Requires-Dist: pySFeel
 Requires-Dist: openpyxl
 Requires-Dist: pandas
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # pyDMNrules
 An implementation of DMN (Decision Model Notation) in Python, using the [pySFeel](https://pypi.org/project/pySFeel/), [openpyxl](https://pypi.org/project/openpyxl/) and [pandas](httpsL//pypi.org/project/pandas) modules.

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/SETUP_GUIDE.md

@@ -275,3 +275,4 @@ Claude가 자동으로:
 3. 로그 확인
 4. 의존성 재설치: `pip install -r requirements_mcp.txt --force-reinstall`
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/pyDMNrules/DMNrules.py

@@ -44,6 +44,10 @@ class DMN():
         self.isLoaded = False
         self.testIsLoaded = False
         self.decisionDependencies = {}  # Decision ID -> list of required decision IDs
+        self.decisionIdToTables = {}  # Decision ID -> list of table names
+        self.decisionTableToId = {}   # Table name -> Decision ID
+        self.decisionRequiredInputs = {}  # Decision ID -> list of required inputData IDs
+        self.inputDataIdToVariable = {}  # InputData ID -> variable name
         self.errors = []
         self.DMNfunctions = [
             'date(', 'time(', 'date and time(',
@@ -2341,6 +2345,10 @@ class DMN():
         self.decisionName = ''
         self.decisions = []
         self.decisionDependencies = {}  # Decision ID -> list of required decision IDs
+        self.decisionIdToTables = {}  # Decision ID -> list of table names
+        self.decisionTableToId = {}   # Table name -> Decision ID
+        self.decisionRequiredInputs = {}  # Decision ID -> list of required inputData IDs
+        self.inputDataIdToVariable = {}  # InputData ID -> variable name
         self.decisionHeading = []
         self.otherDecisions = []
         self.decisionTables = {}
@@ -2936,18 +2944,29 @@ class DMN():
         self.decisionHeading = [0, 'Decisions', 'Execute Decision Tables']
         theseTables  = list(self.decisionTables)
         
-        # Build a mapping from decision IDs to table names
-        idToTable = {}
-        tableToId = {}
-        if hasattr(self, 'decisionDependencies') and self.decisionDependencies:
-            for dec_id in self.decisionDependencies:
-                # Try to match decision ID with table name
-                for table in self.decisionTables:
-                    # Match by ID or by name similarity
-                    if dec_id == table or dec_id.lower().replace('_', ' ') == table.lower():
-                        idToTable[dec_id] = table
-                        tableToId[table] = dec_id
-                        break
+        # Use the prebuilt mapping from decision IDs to table names
+        # This mapping was created in useXML() from XMLdecisions
+        if hasattr(self, 'decisionTableToId') and self.decisionTableToId:
+            tableToId = self.decisionTableToId
+            # Build reverse mapping: for each decision ID, get all its tables (first table only for simplicity)
+            idToTable = {}
+            if hasattr(self, 'decisionIdToTables') and self.decisionIdToTables:
+                for dec_id, tables in self.decisionIdToTables.items():
+                    if tables:
+                        idToTable[dec_id] = tables[0]  # Use first table as representative
+        else:
+            # Fallback to old matching logic if mappings not available
+            idToTable = {}
+            tableToId = {}
+            if hasattr(self, 'decisionDependencies') and self.decisionDependencies:
+                for dec_id in self.decisionDependencies:
+                    # Try to match decision ID with table name
+                    for table in self.decisionTables:
+                        # Match by ID or by name similarity
+                        if dec_id == table or dec_id.lower().replace('_', ' ') == table.lower():
+                            idToTable[dec_id] = table
+                            tableToId[table] = dec_id
+                            break
         
         while len(theseTables) > 0:
             for i in range(len(theseTables)):           # Check every table looking for tables with no dependencies
@@ -3080,6 +3099,10 @@ class DMN():
         self.decisionHeading = [0, 'Decisions', 'Execute Decision Tables']      # There are no input tests and there may be no annotations
         self.decisions = []
         self.decisionDependencies = {}  # Decision ID -> list of required decision IDs
+        self.decisionIdToTables = {}  # Decision ID -> list of table names
+        self.decisionTableToId = {}   # Table name -> Decision ID
+        self.decisionRequiredInputs = {}  # Decision ID -> list of required inputData IDs
+        self.inputDataIdToVariable = {}  # InputData ID -> variable name
         self.otherDecisions = []
         self.decisionTables = {}
 
@@ -3093,7 +3116,9 @@ class DMN():
             thisName = itemDefinition.get('name')
             XMLitemDefinitions[thisName] = itemDefinition
         XMLvariables = {}
+        XMLinputDataMap = {}  # Map inputData ID -> variable name
         for inputData in root.iter(DMN + 'inputData'):
+            inputDataId = inputData.get('id')
             thisVariable = inputData.find('variable', namespaces=ns)
             if thisVariable is None:
                 continue
@@ -3103,6 +3128,11 @@ class DMN():
                 status['errors'] = self.errors
                 return status
             variable = thisVariable.get('name')
+            
+            # Store mapping from inputData ID to variable name
+            if inputDataId:
+                XMLinputDataMap[inputDataId] = variable
+            
             if 'typeRef' not in thisVariable.keys():
                 continue
             typeRef = thisVariable.get('typeRef')
@@ -3190,17 +3220,23 @@ class DMN():
                                     XMLvariables[variable] = typeRef
                 outputs = thisTable.findall('output', namespaces=ns)
                 for thisOutput in outputs:
-                    if 'label' in thisOutput.keys():
+                    # Prefer 'name' attribute over 'label' for output variable name (DMN standard)
+                    if 'name' in thisOutput.keys():
+                        variable = thisOutput.get('name')
+                    elif 'label' in thisOutput.keys():
                         variable = thisOutput.get('label')
-                        if (thisTable in XMLdecisionBindings) and (variable in XMLdecisionBindings[thisTable]):
-                            variable = XMLdecisionBindings[thisTable][variable]
-                        elif (decisionName in XMLdecisionVariables) and (len(XMLdecisionVariables[decisionName]) == 1) and (len(outputs) == 1):
-                            variable = XMLdecisionVariables[decisionName][0]
-                        if variable not in XMLvariables:
-                            outputExpression = thisOutput.find('inputExpression', namespaces=ns)
-                            if (outputExpression is not None) and ('typeRef' in outputExpression.keys()):
-                                typeRef = outputExpression.get('typeRef')
-                                XMLvariables[variable] = typeRef
+                    else:
+                        continue
+                        
+                    if (thisTable in XMLdecisionBindings) and (variable in XMLdecisionBindings[thisTable]):
+                        variable = XMLdecisionBindings[thisTable][variable]
+                    elif (decisionName in XMLdecisionVariables) and (len(XMLdecisionVariables[decisionName]) == 1) and (len(outputs) == 1):
+                        variable = XMLdecisionVariables[decisionName][0]
+                    if variable not in XMLvariables:
+                        outputExpression = thisOutput.find('inputExpression', namespaces=ns)
+                        if (outputExpression is not None) and ('typeRef' in outputExpression.keys()):
+                            typeRef = outputExpression.get('typeRef')
+                            XMLvariables[variable] = typeRef
 
         for variable in XMLvariables:
             typeRef = XMLvariables[variable]
@@ -3317,6 +3353,7 @@ class DMN():
             XMLdecisions[-1]['tables'] = []
             XMLdecisions[-1]['annotations'] = {}
             XMLdecisions[-1]['required'] = []
+            XMLdecisions[-1]['requiredInputs'] = []  # Track required inputData
             XMLdecisions[-1]['done'] = False
             for infoRequired in decision.findall('informationRequirement', namespaces=ns):
                 requiredDecision = infoRequired.find('requiredDecision', namespaces=ns)
@@ -3334,6 +3371,23 @@ class DMN():
                         status = {}
                         status['errors'] = self.errors
                         return status
+                
+                # Also handle requiredInput (inputData -> decision)
+                requiredInput = infoRequired.find('requiredInput', namespaces=ns)
+                if requiredInput is not None:
+                    if 'href' not in requiredInput.keys():
+                        self.errors.append('Invalid XML')
+                        status = {}
+                        status['errors'] = self.errors
+                        return status
+                    inputRef = requiredInput.get('href')
+                    if inputRef[0] == '#':      # Internal reference
+                        XMLdecisions[-1]['requiredInputs'].append(inputRef[1:])     # The 'id' of the required inputData
+                    else:
+                        self.errors.append('Invalid XML')
+                        status = {}
+                        status['errors'] = self.errors
+                        return status
 
             # There can be multiple decisionTable for each decision
             theseTables = list(decision.findall('decisionTable', namespaces=ns))
@@ -3703,8 +3757,11 @@ class DMN():
                         status = {}
                         status['errors'] = self.errors
                         return status
-                    variable = text.text
-                    if 'label' in inputVariable.keys():
+                    # Use inputExpression text as variable name (DMN standard)
+                    # The text is the FEEL expression that references the actual variable
+                    variable = text.text if text.text else ''
+                    # Only use label as fallback if text is empty
+                    if variable == '' and 'label' in inputVariable.keys():
                         variable = inputVariable.get('label')
                     if (table in XMLdecisionBindings) and (variable in XMLdecisionBindings[table]):
                         variable = XMLdecisionBindings[table][variable]
@@ -3845,16 +3902,17 @@ class DMN():
                 # Outputs should have a label (for linkage to inputs) and can have outputValues
                 outputs = []
                 for outputVariable in XMLdecisionTable.findall('output', namespaces=ns):
-                    if 'label' in outputVariable.keys():
-                        if outputLabel != '':
-                            variable = outputLabel
-                        else:
-                            variable = outputVariable.get('label')
-                    elif 'name' in outputVariable.keys():
+                    # Prefer 'name' attribute over 'label' for output variable name (DMN standard)
+                    if 'name' in outputVariable.keys():
                         if outputLabel != '':
                             variable = outputLabel + '.' + outputVariable.get('name')
                         else:
                             variable = outputVariable.get('name')
+                    elif 'label' in outputVariable.keys():
+                        if outputLabel != '':
+                            variable = outputLabel
+                        else:
+                            variable = outputVariable.get('label')
                     elif outputLabel != '':
                         variable = outputLabel
                         outputLabel = ''
@@ -4100,11 +4158,23 @@ class DMN():
 
         # Save decision dependencies from XMLdecisions
         self.decisionDependencies = {}
+        self.decisionIdToTables = {}  # Map decision ID to its table names
+        self.decisionTableToId = {}   # Map table name to its decision ID
+        self.decisionRequiredInputs = {}  # Map decision ID to required inputData IDs
+        self.inputDataIdToVariable = XMLinputDataMap  # Map inputData ID to variable name
+        
         for xmlDec in XMLdecisions:
             dec_id = xmlDec.get('id')
             required_ids = xmlDec.get('required', [])
+            required_inputs = xmlDec.get('requiredInputs', [])
+            tables = xmlDec.get('tables', [])
             if dec_id:
                 self.decisionDependencies[dec_id] = required_ids
+                self.decisionRequiredInputs[dec_id] = required_inputs
+                self.decisionIdToTables[dec_id] = tables
+                # Create reverse mapping for each table
+                for table in tables:
+                    self.decisionTableToId[table] = dec_id
 
         # Now build a decision order
         theseTables = self.buildDecision(theseInputs, theseOutputs)
@@ -5215,6 +5285,10 @@ class DMN():
             self.errors = []
             return (status, {})
         self.initGlossary()
+        
+        # Store original input data keys for later requiredInput mapping
+        original_input_keys = set(data.keys())
+        
         validData = True
         for variable in data:
             value = data[variable]
@@ -5271,6 +5345,53 @@ class DMN():
             self.errors = []
             return (status, {})
 
+        # Handle requiredInput automatic mapping (inputData variable -> inputExpression text)
+        # For each decision table, check if it has requiredInputs and map inputData values to inputExpression variables
+        if hasattr(self, 'decisionTableToId') and hasattr(self, 'decisionRequiredInputs') and hasattr(self, 'inputDataIdToVariable'):
+            for table_name in self.decisionTables:
+                # Get the decision ID for this table
+                if table_name in self.decisionTableToId:
+                    dec_id = self.decisionTableToId[table_name]
+                    # Get the required input IDs for this decision
+                    if dec_id in self.decisionRequiredInputs:
+                        required_input_ids = self.decisionRequiredInputs[dec_id]
+                        # Get the inputColumns for this table
+                        input_columns = self.decisionTables[table_name].get('inputColumns', [])
+                        
+                        # Map each required inputData to corresponding inputExpression
+                        for i, input_data_id in enumerate(required_input_ids):
+                            if input_data_id in self.inputDataIdToVariable and i < len(input_columns):
+                                input_var_name = self.inputDataIdToVariable[input_data_id]
+                                input_expr_name = input_columns[i].get('name')
+                                
+                                # If inputData variable exists in glossary and was provided
+                                if input_var_name in self.glossary and input_expr_name and input_var_name in original_input_keys:
+                                    input_item = self.glossary[input_var_name]['item']
+                                    # Get the value
+                                    (failed, input_value) = self.sfeel('{}'.format(input_item))
+                                    if not failed and input_value is not None:
+                                        # Create a glossary entry for the inputExpression name if it doesn't exist
+                                        if input_expr_name not in self.glossary:
+                                            attribute = re.sub(self.badFEELchars, '', input_expr_name.replace(' ', '_'))
+                                            expr_item = 'Data.' + attribute
+                                            if expr_item not in self.glossaryItems:
+                                                self.glossary[input_expr_name] = {}
+                                                self.glossary[input_expr_name]['item'] = expr_item
+                                                self.glossary[input_expr_name]['concept'] = 'Data'
+                                                self.glossaryItems[expr_item] = input_expr_name
+                                                thisLen = len(input_expr_name)
+                                                if thisLen not in self.glossaryLen:
+                                                    self.glossaryLen[thisLen] = []
+                                                self.glossaryLen[thisLen].append(input_expr_name)
+                                                self.glossary[input_expr_name]['annotations'] = []
+                                        
+                                        # Store the value under the inputExpression name
+                                        if input_expr_name in self.glossary:
+                                            expr_item = self.glossary[input_expr_name]['item']
+                                            sFeelValue = self.value2sfeel(input_value)
+                                            if sFeelValue is not None:
+                                                (failed, retVal) = self.sfeel('{} <- {}'.format(expr_item, sFeelValue))
+
         # Initialize the status so we can detect circular references
         for table in self.decisionTables:
             self.decisionTables[table]['status'] = 'idle'

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/pyDMNrules_enhanced.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pyDMNrules-enhanced
-Version: 1.5.0
-Summary: Enhanced pyDMNrules with full decision dependency support (<informationRequirement>)
+Version: 1.6.0
+Summary: Enhanced pyDMNrules with full DRD support (informationRequirement/requiredInput auto-mapping)
 Home-page: https://github.com/uengine/pyDMNrules
 Author: Russell McDonell (Enhanced by uengine)
 Author-email: russell.mcdonell@c-cost.com
@@ -16,16 +16,6 @@ Requires-Dist: datetime
 Requires-Dist: pySFeel
 Requires-Dist: openpyxl
 Requires-Dist: pandas
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # pyDMNrules
 An implementation of DMN (Decision Model Notation) in Python, using the [pySFeel](https://pypi.org/project/pySFeel/), [openpyxl](https://pypi.org/project/openpyxl/) and [pandas](httpsL//pypi.org/project/pandas) modules.

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/pydmnrules_mcp/__init__.py

@@ -26,3 +26,4 @@ __all__ = [
     "__version__"
 ]
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/requirements_mcp.txt

@@ -12,3 +12,4 @@ pydmnrules-enhanced>=1.5.0
 pytest>=7.4.0
 pytest-asyncio>=0.21.0
 
+

{pydmnrules_enhanced-1.5.0 → pydmnrules_enhanced-1.6.0}/setup.py

@@ -5,10 +5,10 @@ with open('README.md', 'r') as fh:
 
 setuptools.setup(
     name='pyDMNrules-enhanced',
-    version='1.5.0',
+    version='1.6.0',
     author='Russell McDonell (Enhanced by uengine)',
     author_email='russell.mcdonell@c-cost.com',
-    description='Enhanced pyDMNrules with full decision dependency support (<informationRequirement>)',
+    description='Enhanced pyDMNrules with full DRD support (informationRequirement/requiredInput auto-mapping)',
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://github.com/uengine/pyDMNrules',