reflexive 1.0.17__tar.gz → 1.0.19__tar.gz

{reflexive-1.0.17/reflexive.egg-info → reflexive-1.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflexive
-Version: 1.0.17
+Version: 1.0.19
 Summary: Supports AWS Reflexive Expressions Analysis
 Home-page: https://github.com/nlytx/reflexive
 Author: Andrew Gibson

{reflexive-1.0.17 → reflexive-1.0.19}/reflexive/visualise.py

@@ -109,8 +109,8 @@ class Display:
                     x = None
                 else:
                     # both start and end is available
-                    taken.append(off[0])
-                    taken.append(off[1])
+                    for t in range(off[0],(off[1]+1)):
+                        taken.append(t)
                     #print(taken)
                     new_ent["start"] = off[0]
                     new_ent["end"] = off[1]
@@ -153,8 +153,29 @@ class Display:
         for sr in syntax_results:
             pos = sr['PartOfSpeech']
             if pos['Score']>0.99:
-                if pos['Tag'] in ['PRON','NOUN','ADJ']:
+                if pos['Tag'] in ['NOUN','ADJ']:
                     offsets.setdefault("EO",[]).append((sr['BeginOffset'],sr['EndOffset']))
                 if pos['Tag'] in ['ADV','VERB']:
                     offsets.setdefault("EA",[]).append((sr['BeginOffset'],sr['EndOffset']))
-        return offsets
+        return self.concatenate_offsets(offsets)
+    
+    def concatenate_offsets(self,offsets:dict):
+        new_offsets = {}
+        for k in offsets.keys():
+            #print("TAG:",k)
+            #print("Offsets:",len(offsets[k]))
+            b,e = offsets[k][0] # set to first tag
+            for v in offsets[k]:
+                #print("b,e",b,e)
+                #print("offset:",v)
+                if v[0] <= (e+1): # this tag extends a previous tag
+                    e = v[1]
+                    #print("extending")
+                    #print("new_offset:",(b,e))
+                else:   # this tag starts a new tag
+                    #print("new tag")
+                    new_offsets.setdefault(k,[]).append((b,e))
+                    b = v[0]
+                    e = v[1]
+            #print("New offsets:",len(new_offsets[k]))
+        return new_offsets

{reflexive-1.0.17 → reflexive-1.0.19/reflexive.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflexive
-Version: 1.0.17
+Version: 1.0.19
 Summary: Supports AWS Reflexive Expressions Analysis
 Home-page: https://github.com/nlytx/reflexive
 Author: Andrew Gibson

{reflexive-1.0.17 → reflexive-1.0.19}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = reflexive
-version = 1.0.17
+version = 1.0.19
 author = Andrew Gibson
 author_email = andrew@nlytx.io
 description = Supports AWS Reflexive Expressions Analysis