reflexive 1.2.1__tar.gz → 1.2.2__tar.gz

{reflexive-1.2.1 → reflexive-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflexive
-Version: 1.2.1
+Version: 1.2.2
 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.1 → reflexive-1.2.2}/pyproject.toml

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

reflexive-1.2.2/src/reflexive/__init__.py

@@ -0,0 +1,15 @@
+# Make classes available at top level
+
+from reflexive.cfg import Config
+from reflexive.session import (
+    AWS,
+    S3,
+    Comprehend)
+
+# import reflexive.util
+from reflexive.analyse import Nlp
+from reflexive.visualise import (
+    Display,
+    RES_graph)
+
+__all__ = ["Config","AWS","S3","Comprehend","Nlp","Display","RES_graph"]

{reflexive-1.2.1 → reflexive-1.2.2}/src/reflexive/analyse.py

@@ -6,7 +6,6 @@ import re
 from reflexive import util
 from reflexive import cfg
 from reflexive import session
-import reflexive as rfx
 
 import logging
 logging.basicConfig(level=logging.DEBUG)
@@ -290,7 +289,7 @@ class Nlp:
         for grp in targetedSentiment_results:
             for mention in grp["Mentions"]:
                 if mention['Score'] >= threshold:
-                    if not "NEUTRAL" in mention['MentionSentiment']['Sentiment']:
+                    if "NEUTRAL" not in mention['MentionSentiment']['Sentiment']:
                         k = mention['MentionSentiment']['Sentiment']
                         text = str.lower(mention['Text'])
                         sents.setdefault(k,{text}).add(text)

{reflexive-1.2.1 → reflexive-1.2.2}/src/reflexive/cfg.py

@@ -1,10 +1,8 @@
 import logging
 import os
 from datetime import datetime
-import json
-import reflexive as rfx
 
-logging.basicConfig(level=logging.DEBUG)
+#logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 class Config:
@@ -74,7 +72,7 @@ class Config:
             if not os.path.exists(data_dir):
                 logger.warning("Path does not exist, creating directory")
                 os.makedirs(data_dir)
-                logger.info(f"Created %s",repr(data_dir))
+                logger.info("Created %s",repr(data_dir))
             self.local_path = local_path
         if not date_string:
             date_string = datetime.today().strftime('%Y%m%d')

{reflexive-1.2.1 → reflexive-1.2.2}/src/reflexive/session.py

@@ -5,7 +5,6 @@ import tarfile
 import json
 
 from reflexive import cfg
-import reflexive as rfx
 
 import logging
 logging.basicConfig(level=logging.DEBUG)
@@ -19,7 +18,7 @@ class AWS:
     def __init__(self,config:cfg.Config):
         # on initialisation create a new session with provided profile (or with default profile)
         #logger.error(config.get_parameters())
-        if config==None:
+        if config is None:
             config = cfg.Config()
         self.config = config
         self.new_session()

{reflexive-1.2.1 → reflexive-1.2.2}/src/reflexive/util.py

@@ -1,10 +1,12 @@
 import os
-
+import json
+import pandas as pd
+from sklearn.preprocessing import MinMaxScaler
 import logging
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
-from sklearn.preprocessing import MinMaxScaler
+
 
 # File functions
 def get_data_path_name(config,name,ext):
@@ -20,7 +22,7 @@ def set_sub_dir(config,sub_dir=None):
             logger.info(f"Creating subdirectory: {local_dir}")
             os.makedirs(local_dir)
     else:
-        local_dir = local_path
+        local_dir = config.local_path
     return local_dir
         
 
@@ -46,12 +48,12 @@ def filter_dict_by_value(ngrams,min_val=3):
 
 # Input a series and output a list of lists with each maxn elements
 def series_to_chunked_list(series,maxn=25):
-    l = list(series)
-    return __chunk_list(l,maxn)
+    lst = list(series)
+    return __chunk_list(lst,maxn)
 
 # Chunk a list into a list of lists with maxn elements
-def __chunk_list(l,maxn=25):
-    return [l[i:i + maxn] for i in range(0, len(l), maxn)]
+def __chunk_list(lst,maxn=25):
+    return [lst[i:i + maxn] for i in range(0, len(lst), maxn)]
 
 # Count named entities
 def count_entities(entities):

{reflexive-1.2.1 → reflexive-1.2.2}/src/reflexive/visualise.py

@@ -1,6 +1,13 @@
-from graph_tool.all import *
+from graph_tool.all import (
+    Graph,
+    graph_draw,
+    ungroup_vector_property,
+    group_vector_property
+)
 import cairo
 
+from spacy import displacy
+
 from reflexive import session
 from reflexive import cfg
 
@@ -188,6 +195,18 @@ class Display:
             #print("New offsets:",len(new_offsets[k]))
         return new_offsets
     
+class RES_text:
+    
+    def __init__(self):
+        self._setup()
+        
+    def _setup(self):
+        return None
+    
+    def show(self):
+        #displacy.render(disp_data,manual=True,style="ent", options=cfg.display_options)
+        return None
+     
 class RES_graph:
     
     #

reflexive-1.2.1/src/reflexive/__init__.py

@@ -1,5 +0,0 @@
-import reflexive.analyse
-import reflexive.cfg
-import reflexive.session
-import reflexive.util
-import reflexive.visualise