Merge branch 'main' of https://github.com/mj023/pytask-plugin-vscode

Author: mj023

README.md

@@ -1,20 +1,15 @@
 # pytask-vscode
 
-  
-[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/mj023/pytask-vscode/main.svg)](https://results.pre-commit.ci/latest/github/mj023/pytask-vscode/main)
-[![image](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+This is a plugin for Pytask. It is needed to use the Pytask VS Code Extension.
 
 
 ## Installation
 
-pytask-vscode is available on [PyPI](https://pypi.org/project/pytask-vscode) and [Anaconda.org](https://anaconda.org/conda-forge/pytask-vscode). Install it with
+pytask-vscode is available on [PyPI](https://test.pypi.org/project/pytask-vscode/). Install it with
 
 ```console
-$ pip install pytask-vscode
+$ pip install -i https://test.pypi.org/simple/ pytask-vscode
 
-# or
-
-$ conda install -c conda-forge pytask-vscode
 ```
 
 ## Changes

environment.yml

@@ -11,8 +11,9 @@ dependencies:
   - toml
 
   # Package dependencies
-  - pytask >=0.2
+  - pytask >=0.4.1
   - pytask-parallel >=0.2
+  - requests
 
   # Misc
   - black

pyproject.toml

@@ -2,7 +2,6 @@
 requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"]
 build-backend = "setuptools.build_meta"
 
-
 [tool.setuptools_scm]
 write_to = "src/pytask_vscode/_version.py"
 

setup.cfg

@@ -29,7 +29,8 @@ project_urls =
 packages = find:
 install_requires =
     click
-    pytask>=0.2
+    pytask>=0.4.1
+    requests
 python_requires = >=3.7
 include_package_data = True
 package_dir = =src

src/pytask_vscode/execution.py

@@ -1,22 +1,34 @@
 import pytask
 import json
 import requests
+from contextlib import redirect_stdout
+import io
 
 @pytask.hookimpl(tryfirst=True)
-def pytask_collect_log(session: pytask.Session, reports: list[pytask.CollectionReport], tasks: list[pytask.Task]) -> None:
+def pytask_collect_log(session: pytask.Session, reports: list[pytask.CollectionReport], tasks: list[pytask.PTask]) -> None:
         try:    
             if session.config['command'] == 'collect':
-                result = [{'name' : task.short_name, 'path' : str(task.path)} for task in tasks]
-                res = requests.post('http://localhost:6000/pytask', json={"exitcode" : session.exit_code, "tasks": result}, timeout=0.1)
+                result = [{'name' : task.name.split('/')[-1], 'path' : str(task.path)} if isinstance(task,pytask.PTaskWithPath) else {'name' : task.name, 'path' : ''} for task in tasks]
+                res = requests.post('http://localhost:6000/pytask', json={"exitcode" : session.exit_code, "tasks": result}, timeout=0.0001)
+        except requests.exceptions.ReadTimeout: 
+            pass
         except Exception as e:
             pass
 
 
 @pytask.hookimpl(tryfirst=True)
 def pytask_execute_task_log_end(session: pytask.Session, report: pytask.ExecutionReport) -> None:
 
-    try:    
-        result = {'type': 'task', 'name' : report.task.short_name, 'outcome' : str(report.outcome)}
-        res = requests.post('http://localhost:6000/pytask', json=result)
+    try:
+        if report.outcome == pytask.TaskOutcome.FAIL:
+            with pytask.console.capture() as capture:
+                pytask.console.print(pytask.render_exc_info(report.exc_info[0], report.exc_info[1], report.exc_info[2]))
+            s = capture.get()
+            result = {'type': 'task', 'name' : report.task.name.split('/')[-1], 'outcome' : str(report.outcome), 'exc_info' : s}
+        else:
+            result = {'type': 'task', 'name' : report.task.name.split('/')[-1], 'outcome' : str(report.outcome)}
+        res = requests.post('http://localhost:6000/pytask', json=result, timeout=0.00001)
+    except requests.exceptions.ReadTimeout: 
+        pass
     except Exception as e:
         pass