dataflow-core 2.1.12__py3-none-any.whl → 2.1.14__py3-none-any.whl

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/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/schemas/connection.py

@@ -29,11 +29,11 @@ class ConnectionBase(BaseModel):
         import re
         if not isinstance(v, str):
             raise ValueError("Connection ID must be a string.")
-        if len(v) > 20:
-            raise ValueError("Connection ID must be at most 20 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9-]+", v):
+        if len(v) > 30:
+            raise ValueError("Connection ID must be at most 30 characters long.")
+        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
             raise ValueError(
-                "Connection ID can only contain letters, numbers, and hyphens (-)!"
+                "Connection ID can only contain letters, numbers, underscores (_), and hyphens (-)!"
             )
         return v
 

dataflow/schemas/secret.py

@@ -16,11 +16,11 @@ class SecretBase(BaseModel):
         import re
         if not isinstance(v, str):
             raise ValueError("Secret key must be a string.")
-        if len(v) > 20:
-            raise ValueError("Secret key must be at most 20 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9-]+", v):
+        if len(v) > 30:
+            raise ValueError("Secret key must be at most 30 characters long.")
+        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
             raise ValueError(
-                "Secret key can only contain letters, numbers, and hyphens (-)!"
+                "Secret key can only contain letters, numbers, underscores (_), and hyphens (-)!"
             )
         return v
 

{dataflow_core-2.1.12.dist-info → dataflow_core-2.1.14.dist-info}/METADATA

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

{dataflow_core-2.1.12.dist-info → dataflow_core-2.1.14.dist-info}/RECORD

@@ -5,7 +5,7 @@ authenticator/dataflowsupersetauthenticator.py,sha256=NkAmDaIc-ui-qEolu4xz_UY7P_
 dataflow/__init__.py,sha256=WTRg8HMpMWSgxYJ9ZGVldx4k07fAbta3mBmZ1hG9mWE,30
 dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,899
-dataflow/dataflow.py,sha256=A66OFXgJCxW18Dk_BnasvR82LrPXQ2iB-QMTyYJJ1cc,13100
+dataflow/dataflow.py,sha256=0kPDIpFgrEcK81QYeLQGb-rQTrAH-83gLpn566yvBGA,14004
 dataflow/db.py,sha256=73ojGqpCTRVTlPszD73Ozhjih_BI2KTHmazqxxL6iWk,3780
 dataflow/environment.py,sha256=qiyuRRPpVLVWiYccRHXnGyWMr_ZBPWzixAyDtAzxQYE,28277
 dataflow/models/__init__.py,sha256=5Ai-sUHtT1dtc0l4nL1fuwVbx0GcwaGQg_LXqOzWb4c,981
@@ -31,11 +31,11 @@ dataflow/models/team.py,sha256=fjkqF0N4PSwSYTgHjEQl9wuC7yumd0iOb5nNFePI6q4,488
 dataflow/models/user.py,sha256=-XEpulg7UAL-WDMyigPasDS61btna2mKtJPsanWA4lw,1108
 dataflow/models/user_environment.py,sha256=yI9NutULcLiwlycuEin6ROe6o1Sjdv_sgw2MEkJFeYg,568
 dataflow/models/user_team.py,sha256=r_fmKvf6JuGgiiI9TXWjVG2QZ3WOvDrOwYWVQ3r8oWo,659
-dataflow/models/variables.py,sha256=Sinvv3zFYni5i_GrL69cVfhCh4tOOaIHiEzWYRJ-i10,1132
+dataflow/models/variables.py,sha256=thWqX9KbR2x0oBI-bVcW5TV1eKf0TYNxgGmZWTUs2g4,1414
 dataflow/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataflow/schemas/connection.py,sha256=1bKTSEPW1QwcFQe35QCIr-S5DTMr34WJCjSKhxMpPek,2449
+dataflow/schemas/connection.py,sha256=ut2sqz06yOjmFKzHry92FEt7DN09Bj30GYse35__Cuw,2467
 dataflow/schemas/git_ssh.py,sha256=N1O7HM6ZbygIBZn2rKvNR0e7IM3ZJMAH6aJtjaghDr0,1283
-dataflow/schemas/secret.py,sha256=dAN_2IBTjnjf4sT6cyPVd_Zcdaw8s_EMG4aodMoCwXU,1165
+dataflow/schemas/secret.py,sha256=wMSCn6zoBHS-R4NoKwljq2JUad8p9JY542UNJFa86X8,1183
 dataflow/scripts/clone_environment.sh,sha256=Qy0GylsA3kUVUL_L1MirxIWujOFhT1tikKqXNtCTWd4,506
 dataflow/scripts/create_environment.sh,sha256=3FHgNplJuEZvyTsLqlCJNX9oyfXgsfqn80VZk2xtvso,828
 dataflow/scripts/update_environment.sh,sha256=2dtn2xlNi6frpig-sqlGE1_IKRbbkqYOCpf_qyMKKII,992
@@ -50,8 +50,8 @@ dataflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/utils/exceptions.py,sha256=8GRFoYZ5dPGQckVm2znaHpPi0ZAs69fK-RGKukEsapk,4432
 dataflow/utils/get_current_user.py,sha256=4nSO3SPVMZhW-MsIgxR3f9ZzrFaIZIuyrM6hvfyE7PQ,1202
 dataflow/utils/logger.py,sha256=7BFrOq5Oiqn8P4XZbgJzMP5O07d2fpdECbbfsjrUuHw,1213
-dataflow_core-2.1.12.dist-info/METADATA,sha256=v2BbzlLVWO3_3VcaE6tkzGS1u0rN9dCI0FzPTf0qKXg,370
-dataflow_core-2.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.12.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.12.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.12.dist-info/RECORD,,
+dataflow_core-2.1.14.dist-info/METADATA,sha256=er2J0BBiZuIgOJJH5yG0mLhVQ81D6qrhHZOad_dYPLE,370
+dataflow_core-2.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.14.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.14.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.14.dist-info/RECORD,,