From 692ae9ca21b98532db14792ff87db0a2547ae699 Mon Sep 17 00:00:00 2001 From: fakebranden Date: Wed, 16 Apr 2025 19:50:46 +0000 Subject: [PATCH] remove runid from tigger req --- .github/workflows/job_scraper_dynamic.yml | 11 +++++------ job_scraper_dynamic.py | 11 +++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/job_scraper_dynamic.yml b/.github/workflows/job_scraper_dynamic.yml index 125eadc..a95cf70 100644 --- a/.github/workflows/job_scraper_dynamic.yml +++ b/.github/workflows/job_scraper_dynamic.yml @@ -6,9 +6,6 @@ on: user_email: description: 'Email of user' required: true - run_id: - description: 'Run ID from Power Automate' - required: true permissions: contents: read @@ -35,11 +32,13 @@ jobs: echo "safe_email=$safe_email" >> $GITHUB_OUTPUT - name: Run Job Scraper + env: + GITHUB_RUN_ID: ${{ github.run_id }} run: | - python job_scraper_dynamic.py "${{ github.event.inputs.user_email }}" "${{ github.event.inputs.run_id }}" + python job_scraper_dynamic.py "${{ github.event.inputs.user_email }}" - name: Upload Output Artifact uses: actions/upload-artifact@v4 with: - name: jobspy_output_${{ steps.vars.outputs.safe_email }}_${{ github.event.inputs.run_id }} - path: outputs/jobspy_output_${{ steps.vars.outputs.safe_email }}_${{ github.event.inputs.run_id }}.csv + name: jobspy_output_${{ steps.vars.outputs.safe_email }}_${{ github.run_id }} + path: outputs/jobspy_output_${{ steps.vars.outputs.safe_email }}_${{ github.run_id }}.csv diff --git a/job_scraper_dynamic.py b/job_scraper_dynamic.py index 68694e0..df430c9 100644 --- a/job_scraper_dynamic.py +++ b/job_scraper_dynamic.py @@ -23,7 +23,6 @@ def load_config(email): return json.load(f), safe_email def scrape_jobs(search_terms, results_wanted_str, max_days_old_str, target_state): - # Convert string values to integers results_wanted = int(results_wanted_str.strip()) max_days_old = int(max_days_old_str.strip()) today = datetime.date.today() @@ -85,10 +84,14 @@ def save_to_csv(jobs, path): if __name__ == "__main__": try: - if len(sys.argv) != 3: - raise ValueError("❌ Usage: python job_scraper_dynamic.py ") + if len(sys.argv) != 2: + raise ValueError("❌ Usage: python job_scraper_dynamic.py ") + + user_email = sys.argv[1] + run_id = os.getenv("GITHUB_RUN_ID") + if not run_id: + raise EnvironmentError("❌ GITHUB_RUN_ID is not set in the environment.") - user_email, run_id = sys.argv[1], sys.argv[2] config, safe_email = load_config(user_email) jobs = scrape_jobs(