dataflow-core 1.0.0__tar.gz → 2.0.1__tar.gz

dataflow_core-2.0.1/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 2.1
+Name: dataflow-core
+Version: 2.0.1
+Summary: Dataflow core package
+Author: Dataflow
+Author-email: 
+Requires-Dist: sqlalchemy
+Requires-Dist: boto3
+Requires-Dist: psycopg2-binary
+Requires-Dist: pymysql

{dataflow-core-1.0.0 → dataflow_core-2.0.1}/authenticator/dataflowairflowauthenticator.py

@@ -60,7 +60,7 @@ class DataflowAirflowAuthenticator(FabAirflowSecurityManagerOverride):
 
             if not user:
                 user_role = self.find_role(user_data.role.title())
-                user = self.add_user(username=user_data.user_name, first_name=self.not_none(user_data.first_name), last_name=self.not_none(user_data.last_name), email=self.not_none(user_data.email), role=user_role)
+                user = self.add_user(username=user_data.user_name, first_name=self.not_none(user_data.first_name), last_name=self.not_none(user_data.last_name), email=self.not_none(user_data.email), role=user_role, password=self.not_none(user_data.password))
 
             environ['REMOTE_USER'] = user.username
             self.write_user_id(user_data.user_id)

dataflow_core-2.0.1/authenticator/dataflowsupersetauthenticator.py

@@ -0,0 +1,57 @@
+from flask import redirect, request
+from flask_appbuilder.security.views import AuthDBView
+from superset.security import SupersetSecurityManager
+from flask_appbuilder.security.views import expose
+from flask_login import login_user
+from .package.configuration import ConfigurationManager
+from .package.models.database import DatabaseManager
+from .package.models import (
+    user as m_user,
+    session as m_session
+    )
+
+class CustomAuthDBView(AuthDBView):
+    def __init__(self):
+        self.dataflow_config = ConfigurationManager('/dataflow/app/config/dataflow.cfg')
+        self.dataflow_database_url = self.dataflow_config.get_config_value('database', 'database_url')
+        self.dataflow_db_instance = DatabaseManager(self.dataflow_database_url)
+        self.dataflow_db = next(self.dataflow_db_instance.get_session())
+        m_user.Base.metadata.create_all(bind=self.dataflow_db_instance.get_engine())
+        m_session.Base.metadata.create_all(bind=self.dataflow_db_instance.get_engine())
+
+    def _get_user_id_from_session(self, session_id):
+        query = self.dataflow_db.query(m_session.Session_table).filter(m_session.Session_table.session_id == session_id).first()
+        return query.user_id if query!=None else None
+
+    def _get_user_details_from_user_table(self, user_id):
+        user_details = self.dataflow_db.query(m_user.User).filter(m_user.User.user_id == user_id).first()
+        return user_details if user_details!=None else None
+    
+    def not_none(self, value):
+        return value if value is not None else ""
+
+    @expose('/login/', methods=['GET'])
+    def login(self):
+        try:
+            session_id = request.cookies.get('dataflow_session')
+            
+            user_id = self._get_user_id_from_session(session_id)
+            user_details = self._get_user_details_from_user_table(user_id)
+            user = self.appbuilder.sm.find_user(username=user_details.user_name)
+            if user:
+                login_user(user, remember=False)
+            else:
+                user = self.appbuilder.sm.add_user(username=self.not_none(user_details.user_name), first_name=self.not_none(user_details.first_name), last_name=self.not_none(user_details.last_name), email=self.not_none(user_details.email), role=self.appbuilder.sm.find_role('Admin'), password=self.not_none(user_details.password))
+                if user:
+                    login_user(user, remember=False)
+                    
+            return redirect(self.appbuilder.get_url_for_index)
+
+        except Exception as e:
+            return super().login()
+
+
+class CustomSecurityManager(SupersetSecurityManager):
+    authdbview = CustomAuthDBView
+    def __init__(self, appbuilder):
+        super(CustomSecurityManager, self).__init__(appbuilder)

{dataflow-core-1.0.0 → dataflow_core-2.0.1}/dataflow/dataflow.py

@@ -47,8 +47,9 @@ class Dataflow:
             host_name = os.environ["HOSTNAME"]
             user_name = host_name.replace("jupyter-","")
             
-            vault_path = "variable"
-            return self.secrets_manager.get_secret_by_key(vault_path, user_name, variable_name)
+            vault_path = "variables"
+            variable_data =  self.secrets_manager.get_secret_by_key(vault_path, user_name, variable_name)
+            return variable_data['value']
             
         except Exception as e:
             return None

dataflow_core-2.0.1/dataflow_core.egg-info/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 2.1
+Name: dataflow-core
+Version: 2.0.1
+Summary: Dataflow core package
+Author: Dataflow
+Author-email: 
+Requires-Dist: sqlalchemy
+Requires-Dist: boto3
+Requires-Dist: psycopg2-binary
+Requires-Dist: pymysql

{dataflow-core-1.0.0 → dataflow_core-2.0.1}/dataflow_core.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ setup.py
 authenticator/__init__.py
 authenticator/dataflowairflowauthenticator.py
 authenticator/dataflowhubauthenticator.py
+authenticator/dataflowsupersetauthenticator.py
 authenticator/package/__init__.py
 authenticator/package/configuration.py
 authenticator/package/models/__init__.py

{dataflow-core-1.0.0 → dataflow_core-2.0.1}/dataflow_core.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [jupyterhub.authenticators]
 dataflow_authenticator = authenticator.dataflowhubauthenticator:DataflowHubAuthenticator
-

dataflow_core-2.0.1/dataflow_core.egg-info/requires.txt

@@ -0,0 +1,4 @@
+sqlalchemy
+boto3
+psycopg2-binary
+pymysql

{dataflow-core-1.0.0 → dataflow_core-2.0.1}/setup.py

@@ -2,13 +2,15 @@ from setuptools import setup, find_packages
 
 setup(
     name="dataflow-core",
-    version="1.0.0",
+    version="2.0.1",
     packages=find_packages(exclude=["tests", "tests.*"]),
     include_package_data=True,
     package_data={},
     install_requires=[
         'sqlalchemy',
         'boto3',
+        'psycopg2-binary',
+        'pymysql'
     ],
     author="Dataflow",
     author_email="",
@@ -18,4 +20,4 @@ setup(
             'dataflow_authenticator = authenticator.dataflowhubauthenticator:DataflowHubAuthenticator',
         ],
     },
-)
+)

dataflow-core-1.0.0/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: dataflow-core
-Version: 1.0.0
-Summary: Dataflow core package
-Home-page: UNKNOWN
-Author: Dataflow
-Author-email: UNKNOWN
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN

dataflow-core-1.0.0/dataflow_core.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: dataflow-core
-Version: 1.0.0
-Summary: Dataflow core package
-Home-page: UNKNOWN
-Author: Dataflow
-Author-email: UNKNOWN
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN

dataflow-core-1.0.0/dataflow_core.egg-info/requires.txt

@@ -1,2 +0,0 @@
-sqlalchemy
-boto3