reflexive 1.2.3__tar.gz → 1.2.4__tar.gz

{reflexive-1.2.3 → reflexive-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflexive
-Version: 1.2.3
+Version: 1.2.4
 Summary: Supports AWS Reflexive Expressions Systems (RES) Analysis
 Project-URL: Repository, https://github.com/nlytx/reflexive.git
 Author-email: Andrew Gibson <andrew@nlytx.io>

{reflexive-1.2.3 → reflexive-1.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflexive"
-version = "1.2.3"
+version = "1.2.4"
 description = "Supports AWS Reflexive Expressions Systems (RES) Analysis"
 authors = [{name = "Andrew Gibson", email = "andrew@nlytx.io"}]
 readme = "README.md"

{reflexive-1.2.3 → reflexive-1.2.4}/src/reflexive/analyse.py

@@ -8,7 +8,7 @@ from reflexive import cfg
 from reflexive import session
 
 import logging
-logging.basicConfig(level=logging.DEBUG)
+#logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 

{reflexive-1.2.3 → reflexive-1.2.4}/src/reflexive/res.py

@@ -117,10 +117,81 @@ class Res_display:
             html_out = displacy.render(disp_data,manual=True,style="ent", options=self.res_analyse.config.display_options,page=True,jupyter=False)
         return html_out
     
-    def show_graph(self,reflexive_expressions) ->list:
+    def get_interactions(self,df:DataFrame) -> DataFrame:
         #Get RE sequence
-        reseq = [label for re,label in reflexive_expressions]
-        return reseq
+        df = self._add_res_sequence(df)
+        df = self._add_res_interactions(df)
+        df = self._add_res_adj_matrix(df)
+        return df
+    
+    def show_graph(self,df:DataFrame,inline=True) -> str:
+        for am in df.res_adj_matrix:
+            g = RES_graph(am)
+            g.show()
+        return("nothing yet")
+    
+    def _add_res_sequence(self,df):
+        temp_df = df.copy()
+        temp_df['res_sequence'] = temp_df.reflexive_expressions.apply(self._get_res_sequence)
+        return temp_df
+    
+    def _add_res_interactions(self,df):
+        temp_df = df.copy()
+        temp_df['res_interactions'] = temp_df.res_sequence.apply(self._count_res_interactions)
+        return temp_df
+    
+    def _add_res_adj_matrix(self,df):
+        temp_df = df.copy()
+        temp_df['res_adj_matrix'] = temp_df.res_interactions.apply(self._create_adj_matrix)
+        return temp_df
+    
+    def _get_res_sequence(self,reflexive_expressions):
+        re_seq = [label for re,label in reflexive_expressions]
+        res_seq = []
+        # Need to substitute new RES labels for old RE labels
+        for re in re_seq:
+            if re=='ER' or re=='VR':
+                res_seq.append('NR')
+            elif re=='EV':
+                res_seq.append('EP')
+            elif re=='CN':
+                res_seq.append('AF')
+            else:
+                res_seq.append(re)
+        return res_seq
+    
+    def _empty_res_interactions(self) -> dict[tuple,int]:
+        RE_types = ['RR','NR','AR','AF','EP']
+        RE_interactions:dict[tuple,int] = dict()
+        for t1 in RE_types:
+            for t2 in RE_types:
+                entry = tuple(sorted((t1,t2)))
+                if entry not in RE_interactions.keys():
+                    RE_interactions[entry] = 0
+        return RE_interactions
+    
+    def _count_res_interactions(self,re_sequence:list[str]) -> dict[tuple,int]:
+        re_ints = self._empty_res_interactions()
+        limit = len(re_sequence)-1
+        for i,s in enumerate(re_sequence):
+            if i < limit:
+                rei = tuple(sorted((s,re_sequence[i+1])))
+                #print(i,rei)
+                re_ints[rei] += 1 
+        return re_ints
+    
+    def _create_adj_matrix(self,interactions:dict[tuple,int])->list[list[int]]:
+        re_types = ["RR","NR","AR","AF","EP"]
+        matrix = []
+        for r in re_types:
+            row = []
+            for c in re_types:
+                key = tuple(sorted((r,c)))
+                #print(key)
+                weight = interactions.get(key,0)
+                row.append(weight)
+            matrix.append(row)
+        return matrix
         
         
         

{reflexive-1.2.3 → reflexive-1.2.4}/src/reflexive/session.py

@@ -7,7 +7,7 @@ import json
 from reflexive import cfg
 
 import logging
-logging.basicConfig(level=logging.DEBUG)
+#logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 class AWS:

{reflexive-1.2.3 → reflexive-1.2.4}/src/reflexive/util.py

@@ -3,7 +3,7 @@ import json
 import pandas as pd
 from sklearn.preprocessing import MinMaxScaler
 import logging
-logging.basicConfig(level=logging.DEBUG)
+#logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)