lam-cli 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

lam/lam.py

@@ -9,41 +9,61 @@ import subprocess
 from datetime import datetime
 
 import click
+from logtail import LogtailHandler
 from posthog import Posthog
 
 posthog = Posthog(project_api_key='phc_wfeHFG0p5yZIdBpjVYy00o5x1HbEpggdMzIuFYgNPSK', host='https://app.posthog.com')
 
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+handler = LogtailHandler(source_token="TYz3WrrvC8ehYjXdAEGGyiDp")
+logger.addHandler(handler)
+
 jq_path = 'jq'
 
+def truncate_long_strings(data, max_length=1000, truncation_msg="... (truncated)"):
+    """
+    Truncate long strings in a JSON object if they exceed max_length.
+    Append a message to indicate truncation.
+    """
+    if isinstance(data, dict):
+        return {key: truncate_long_strings(value, max_length, truncation_msg) for key, value in data.items()}
+    elif isinstance(data, list):
+        return [truncate_long_strings(item, max_length, truncation_msg) for item in data]
+    elif isinstance(data, str):
+        return data[:max_length] + truncation_msg if len(data) > max_length else data
+    return data
+
 def generate_distinct_id(workspace_id, flow_id):
     user_id = os.getuid()
     hostname = socket.gethostname()
     return f"{user_id}_{hostname}_{workspace_id}_{flow_id}"
 
 def track_event(event_name, properties, workspace_id="local", flow_id="local"):
-    logging.info(f"Event {event_name} triggered, with properties: {properties}")
+    logger.info(f"Event {event_name} triggered, with properties: {properties}")
 
     try:
         distinct_id = generate_distinct_id(workspace_id, flow_id)
         posthog.capture(distinct_id=distinct_id, event=event_name, properties=properties)
     except Exception as e:
-        logging.error(f"Error logging event: {e}")
+        logger.error(f"Error logging event: {e}")
 
 def parse_program_file(program_file):
-    logging.info(f"Parsing program file: {program_file}")
+    logger.info(f"Parsing program file: {program_file}")
     with open(program_file, 'r') as file:
         return ''.join(line for line in file if not line.strip().startswith('#'))
 
 def run_jq(jq_script, input_data):
-    logging.info(f"Running jq script {jq_script} with input data {input_data}")
+    logger.info(f"Running jq script {jq_script} with input data {truncate_long_strings(input_data)}")
     process = subprocess.Popen([jq_path, '-c', jq_script], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
     output, error = process.communicate(input=input_data)
     if error:
-        logging.error(f"Error running jq: {error}")
+        logger.error(f"Error running jq: {error}")
     return output, error
 
 def process_input(input, workspace_id, flow_id):
-    logging.info(f"Processing input: {input}")
+    logger.info(f"Processing input: {truncate_long_strings(input)}")
     if os.path.isfile(input):
         with open(input, 'r') as file:
             return file.read(), None
@@ -51,21 +71,20 @@ def process_input(input, workspace_id, flow_id):
         json.loads(input)
         return input, None
     except json.JSONDecodeError as e:
-        logging.error(f"Invalid JSON input: {e}")
+        logger.error(f"Invalid JSON input: {e}")
         track_event('lam.run.error', {'error': f"Invalid JSON input: {e}", 'workspace_id': workspace_id, 'flow_id': flow_id}, workspace_id, flow_id)
         return None, str(e)
 
 def handle_jq_output(output, as_json, workspace_id, flow_id):
-    logging.info(f"Handling jq output: {output}")
+    logger.info(f"Handling jq output: {truncate_long_strings(output)}")
     try:
         json_output = json.loads(output)
-        # Make sure the output has a top-level object
         if not isinstance(json_output, dict):
             track_event('lam.run.warn', {'error': 'Invalid JSON output', 'workspace_id': workspace_id, 'flow_id': flow_id}, workspace_id, flow_id)
             return {"lam.result": json_output} if as_json else output, None
         return json_output if as_json else output, None
     except json.JSONDecodeError as e:
-        logging.error("Failed to parse JSON output, may be multiple JSON objects. Attempting to parse as JSON lines.")
+        logger.error("Failed to parse JSON output, may be multiple JSON objects. Attempting to parse as JSON lines.")
         track_event('lam.run.warn', {'error': f"Invalid JSON output: {e}", 'workspace_id': workspace_id, 'flow_id': flow_id}, workspace_id, flow_id)
         if as_json:
             json_objects = [json.loads(line) for line in output.strip().split('\n') if line]
@@ -91,14 +110,14 @@ def run(program_file, input, workspace_id, flow_id, as_json):
     log_file = f"lam_run_{workspace_id}_{flow_id}_{timestamp}.log"
     result_file = f"lam_result_{workspace_id}_{flow_id}_{timestamp}.json"
 
-    # Now configure logging with the determined log file name
-    logging.basicConfig(level=logging.INFO, filename=log_file, filemode='w',
-                        format='%(asctime)s - %(levelname)s - %(message)s')
+    file_handler = logging.FileHandler(log_file, 'w')
+    file_handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+    logger.addHandler(file_handler)
 
-    logging.info(f"Logging to {log_file}")
-    logging.info(f"Running command with program file: {program_file}, input: {input}, workspace_id: {workspace_id}, flow_id: {flow_id}, as_json: {as_json}")
+    logger.info(f"Logging to {log_file}")
+    logger.info(f"Running command with program file: {program_file}, input: {truncate_long_strings(input)}, workspace_id: {workspace_id}, flow_id: {flow_id}, as_json: {as_json}")
     if not shutil.which("jq"):
-        logging.error("Unable to find jq, killing process")
+        logger.error("Unable to find jq, killing process")
         click.echo({"lam.error": "jq is not installed"}, err=True)
         track_event('lam.run.error', {'error': 'jq is not installed', 'workspace_id': workspace_id, 'flow_id': flow_id}, workspace_id, flow_id)
         write_to_result_file({"lam.error": "jq is not installed"}, result_file) 
@@ -131,7 +150,8 @@ def run(program_file, input, workspace_id, flow_id, as_json):
         track_event('lam.run.success', {'workspace_id': workspace_id, 'flow_id': flow_id}, workspace_id, flow_id)
         write_to_result_file(result, result_file)
 
-    logging.info("Run complete, waiting for event logger to finish")
+    logger.info("Run complete, waiting for event logger to finish")
+    logger.removeHandler(file_handler)
 
 if __name__ == '__main__':
-    lam()
+    lam()

{lam_cli-0.0.4.dist-info → lam_cli-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lam-cli
-Version: 0.0.4
+Version: 0.0.6
 Summary: Laminar data transformation tool
 Home-page: https://github.com/laminar-run/lam
 Author: Laminar Run, Inc.
@@ -9,6 +9,7 @@ License: GPLv3
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: posthog
+Requires-Dist: logtail-python
 
 
     Laminar is a platform that makes building and maintaining API integrations faster.

lam_cli-0.0.6.dist-info/RECORD

@@ -0,0 +1,8 @@
+lam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lam/lam.py,sha256=a2O622WWikM3OZq_KhTQm-3kl4JHygkYCK_NwQCeTP8,7269
+lam_cli-0.0.6.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+lam_cli-0.0.6.dist-info/METADATA,sha256=vl5pMwIXxzOzmq1AfrYu0eBpvcUu7eDdivn81ofKrlo,404
+lam_cli-0.0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+lam_cli-0.0.6.dist-info/entry_points.txt,sha256=ph7QV6H2VWqf9fU5rtoAgEabDgZ4f85ZImdLXeBmdfA,36
+lam_cli-0.0.6.dist-info/top_level.txt,sha256=WyM7-Ig60qQH9meqS293pEd83jrMtbvGJM8ALZOQCtA,4
+lam_cli-0.0.6.dist-info/RECORD,,

{lam_cli-0.0.4.dist-info → lam_cli-0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

lam_cli-0.0.4.dist-info/RECORD

@@ -1,8 +0,0 @@
-lam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lam/lam.py,sha256=p5VyBROZFx9xl0ueZJXrpRea31Tc22ZH-nK2wtt_BKk,6353
-lam_cli-0.0.4.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-lam_cli-0.0.4.dist-info/METADATA,sha256=p9bpZSiR4hEX5_fSR-sYDq-u1oZ5SRMIYufND0XMlz0,374
-lam_cli-0.0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-lam_cli-0.0.4.dist-info/entry_points.txt,sha256=ph7QV6H2VWqf9fU5rtoAgEabDgZ4f85ZImdLXeBmdfA,36
-lam_cli-0.0.4.dist-info/top_level.txt,sha256=WyM7-Ig60qQH9meqS293pEd83jrMtbvGJM8ALZOQCtA,4
-lam_cli-0.0.4.dist-info/RECORD,,