dataflow-core 2.1.13__tar.gz → 2.1.14rc1__tar.gz

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.13
+Version: 2.1.14rc1
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/authenticator/dataflowairflowauthenticator.py

@@ -4,7 +4,7 @@ from flask_appbuilder.security.views import expose
 from flask_login import login_user
 from airflow.www.security import FabAirflowSecurityManagerOverride
 from dataflow.dataflow import Dataflow
-import logging
+import logging, os
 
 logging.basicConfig(
     level=logging.INFO,
@@ -29,9 +29,15 @@ class DataflowAuthDBView(AuthDBView):
             
             user_details = dataflow.auth(session_id)
             logger.info(f"User details retrieved for: {user_details['user_name']}")
+            if os.getenv("RUNTIME"):
+                role = self.appbuilder.sm.find_role(user_details.get("base_role", "user").title())
+            else:
+                role = self.appbuilder.sm.find_role("Admin")
             user = self.appbuilder.sm.find_user(username=user_details['user_name'])
             if user:
-                logger.info(f"User found: {user}")
+                # Update user role
+                user.role = role
+                self.appbuilder.sm.update_user(user=user)
                 login_user(user, remember=False)
             else:
                 user = self.appbuilder.sm.add_user(
@@ -39,7 +45,7 @@ class DataflowAuthDBView(AuthDBView):
                     first_name=user_details.get("first_name", ""),
                     last_name=user_details.get("last_name", ""), 
                     email=user_details.get("email", ""), 
-                    role=self.appbuilder.sm.find_role(user_details.get("base_role", "user").title())
+                    role=role,
                 )
                 logger.info(f"New user created: {user}")
                 if user:

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/dataflow/dataflow.py

@@ -8,6 +8,34 @@ class Dataflow:
     """
     Dataflow class to interact with Dataflow services.
     """
+
+    @staticmethod
+    def _json_parse(value):  
+        try:
+            result = json.loads(value)
+            if isinstance(result, str):
+                try:
+                    return json.loads(result)
+                except json.JSONDecodeError:
+                    return result
+            return result
+        except (json.JSONDecodeError, TypeError):
+            return value
+    
+    def _parse_response_data(self, response):
+        """Parse response data based on datatype field or fallback to JSON parsing."""
+        data = response.json()
+        value = data.get('value', '')
+        if isinstance(data, dict) and 'datatype' in data:
+            value = data.get('value', '')
+            datatype = data.get('datatype')
+            if datatype == 'json':
+                return self._json_parse(value)
+            else:
+                return value
+        else:
+            return self._json_parse(value)
+
     def auth(self, session_id: str):
         """
         Retrieve and return user information using their session ID.
@@ -41,7 +69,7 @@ class Dataflow:
                   
         except Exception as e:
             return e
-    
+        
     def variable(self, variable_name: str):
         """
         Retrieve a Dataflow variable.
@@ -106,9 +134,9 @@ class Dataflow:
             elif response.status_code != 200:
                 print(f"[Dataflow.variable] Unexpected status {response.status_code} for variable '{variable_name}'")
                 return None
+           
+            return self._parse_response_data(response)
 
-            return response.text.strip().strip('"')
-        
         except requests.exceptions.RequestException as e:
             raise RuntimeError(f"[Dataflow.variable] Failed to fetch variable '{variable_name}'") from e
         
@@ -163,8 +191,8 @@ class Dataflow:
                 print(f"[Dataflow.secret] Unexpected status {response.status_code} for secret '{secret_name}'")
                 return None
 
-            return response.text.strip().strip('"')
-        
+            return self._parse_response_data(response)
+            
         except requests.exceptions.RequestException as e:
             raise RuntimeError(f"[Dataflow.secret] Failed to fetch secret '{secret_name}'") from e
         except Exception as e:
@@ -313,8 +341,7 @@ class Dataflow:
                 print(f"[Dataflow.variable_or_secret] Unexpected status {response.status_code} for key '{key}'")
                 return None
 
-            response_text = response.text.strip().strip('"')
-            return response_text
+            return self._parse_response_data(response)
             
         except requests.exceptions.RequestException as e:
             raise RuntimeError(f"[Dataflow.variable_or_secret] Failed to fetch '{key}'") from e

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/dataflow/models/variables.py

@@ -1,6 +1,11 @@
-from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, func, UniqueConstraint, CheckConstraint, Boolean
+from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, func, UniqueConstraint, CheckConstraint, Boolean, Enum
 from dataflow.db import Base
+import enum
 
+class DataType(str, enum.Enum):
+    raw = "raw"
+    json = "json"
+    file = "file"
 class Variable(Base):
     """
     Unified VARIABLE table to support both Studio and Runtime environments.
@@ -13,13 +18,15 @@ class Variable(Base):
     value = Column(Text, nullable=False)
     type = Column(String, nullable=False)
     description = Column(Text, nullable=True)
+    filename = Column(String, nullable=True)
     runtime = Column(String, nullable=True)
     slug = Column(String, nullable=True)
     created_at = Column(DateTime, server_default=func.now())
     updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now())
     created_by = Column(String, ForeignKey('USER.user_name'), nullable=True)
     is_active = Column(Boolean, default=True, nullable=False)
-
+    datatype = Column(Enum(DataType, name="data_type"), nullable=False)
+    set_as_env = Column(Boolean, default=False, nullable=False)
 
     __table_args__ = (
         CheckConstraint(type.in_(['variable', 'secret']), name='check_variable_type'),

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/dataflow_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.13
+Version: 2.1.14rc1
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.13 → dataflow_core-2.1.14rc1}/setup.py

@@ -14,7 +14,7 @@ class PostInstall(install):
 
 setup(
     name="dataflow-core",
-    version="2.1.13",
+    version="2.1.14rc1",
     packages=find_packages(include=["dataflow", "dataflow.*", "authenticator", "authenticator.*"]),
     include_package_data=True,
     package_data={