Changed feedback_pipeline to content_resolver

.github/workflows/docker-image.yml

@@ -27,7 +27,7 @@ jobs:
       run: mkdir -p output/history
 
     - name: Run the build
-      run: ./feedback_pipeline.py --dev-buildroot test_configs output
+      run: ./content_resolver.py --dev-buildroot test_configs output
 
     - name: Run tests
       run: |

README.md

@@ -106,7 +106,7 @@ Please use the `refresh.sh` script as a reference for deployment.
 
 ## Developer preview
 
-If you want to contribute and test your changes, run the `feedback_pipeline.py` script with test configs in the `test_configs` directory.
+If you want to contribute and test your changes, run the `content_resolver.py` script with test configs in the `test_configs` directory.
 
 To run the script, you'll need Python 3 and the following dependencies:
 
@@ -124,7 +124,7 @@ $ podman run --rm -it --cap-add CAP_SYS_CHROOT --tmpfs /dnf_cachedir -v $(pwd):/
 
 ```
 # mkdir -p output/history
-# ./feedback_pipeline.py --dev-buildroot --dnf-cache-dir /dnf_cachedir test_configs output
+# ./content_resolver.py --dev-buildroot --dnf-cache-dir /dnf_cachedir test_configs output
 ```
 
 The output will be generated in the `output` directory. Open the `output/index.html` in your web browser of choice to see the result.
@@ -140,7 +140,7 @@ $ docker run --rm -it --tmpfs /dnf_cachedir -v $(pwd):/workspace content-resolve
 
 ```
 # mkdir -p output/history
-# ./feedback_pipeline.py --dev-buildroot --dnf-cache-dir /dnf_cachedir test_configs output
+# ./content_resolver.py --dev-buildroot --dnf-cache-dir /dnf_cachedir test_configs output
 ```
 
 The output will be generated in the `output` directory. Open the `output/index.html` in your web browser of choice to see the result.

feedback_pipeline.py → content_resolver.py

@@ -1,13 +1,13 @@
 #!/usr/bin/python3
 
 import datetime
-from feedback_pipeline.analyzer import Analyzer
-from feedback_pipeline.data_generation import generate_data_files
-from feedback_pipeline.historia_data import generate_historic_data
-from feedback_pipeline.page_generation import generate_pages
-from feedback_pipeline.query import Query
-from feedback_pipeline.utils import load_data, log, datetime_now_string, dump_data
-from feedback_pipeline.config_manager import ConfigManager
+from content_resolver.analyzer import Analyzer
+from content_resolver.data_generation import generate_data_files
+from content_resolver.historia_data import generate_historic_data
+from content_resolver.page_generation import generate_pages
+from content_resolver.query import Query
+from content_resolver.utils import load_data, log, datetime_now_string, dump_data
+from content_resolver.config_manager import ConfigManager
 
 
 

feedback_pipeline/analyzer.py → content_resolver/analyzer.py

@@ -1,8 +1,8 @@
 import tempfile, os, json, datetime, dnf, urllib.request, sys, koji
 
 import multiprocessing, asyncio
-from feedback_pipeline.utils import dump_data, load_data, log, err_log, pkg_id_to_name, size, workload_id_to_conf_id, url_to_id
-from feedback_pipeline.exceptions import RepoDownloadError, BuildGroupAnalysisError, KojiRootLogError, AnalysisError
+from content_resolver.utils import dump_data, load_data, log, err_log, pkg_id_to_name, size, workload_id_to_conf_id, url_to_id
+from content_resolver.exceptions import RepoDownloadError, BuildGroupAnalysisError, KojiRootLogError, AnalysisError
 
 
 def pkg_placeholder_name_to_id(placeholder_name):

feedback_pipeline/config_manager.py → content_resolver/config_manager.py

@@ -2,9 +2,9 @@
 import yaml
 import argparse
 
-from feedback_pipeline.utils import err_log, log
+from content_resolver.utils import err_log, log
 
-from feedback_pipeline.exceptions import SettingsError, ConfigError
+from content_resolver.exceptions import SettingsError, ConfigError
 
 class ConfigManager:
     def __init__(self, config_file=None):

feedback_pipeline/data_generation.py → content_resolver/data_generation.py

@@ -1,5 +1,5 @@
 import os
-from feedback_pipeline.utils import dump_data, log
+from content_resolver.utils import dump_data, log
 
 
 def _generate_json_file(data, page_name, settings):

feedback_pipeline/historia_data.py → content_resolver/historia_data.py

@@ -2,8 +2,8 @@
 import json
 import os
 import re
-from feedback_pipeline.data_generation import _generate_json_file
-from feedback_pipeline.utils import dump_data, err_log, log
+from content_resolver.data_generation import _generate_json_file
+from content_resolver.utils import dump_data, err_log, log
 
 
 def _save_current_historic_data(query):

feedback_pipeline/page_generation.py → content_resolver/page_generation.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 import jinja2
-from feedback_pipeline.utils import dump_data, log
+from content_resolver.utils import dump_data, log
 
 
 def _generate_html_page(template_name, template_data, page_name, settings):

feedback_pipeline/query.py → content_resolver/query.py

@@ -5,7 +5,7 @@
 
 from functools import lru_cache
 
-from feedback_pipeline.utils import pkg_id_to_name
+from content_resolver.utils import pkg_id_to_name
 
 
 class Query():

refresh.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This script runs the feedback_pipeline.py with the right configs and pushes out the results
+# This script runs the content_resolvere.py with the right configs and pushes out the results
 
 
 
@@ -41,7 +41,7 @@ echo ""
 echo "Building..."
 echo "$build_started"
 echo "(Logging into ~/logs/$build_started.log)"
-CMD="./feedback_pipeline.py --dnf-cache-dir /dnf_cachedir content-resolver-input/configs out" || exit 1
+CMD="./content_resolver.py --dnf-cache-dir /dnf_cachedir content-resolver-input/configs out" || exit 1
 podman run --rm -it --tmpfs /dnf_cachedir -v $WORK_DIR/content-resolver:/workspace:z localhost/asamalik/fedora-env $CMD > ~/logs/$build_started.log || exit 1
 
 # Save the root log cache

test_config_files.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import feedback_pipeline
+import content_resolver.config_manager
 
 def create_mock_settings():
     settings = {}
@@ -11,7 +11,8 @@ def create_mock_settings():
     return settings
 
 def main():
-    feedback_pipeline.get_configs(create_mock_settings())
+    config_manager = content_resolver.config_manager.ConfigManager()
+    config_manager.get_configs(create_mock_settings())
 
 if __name__ == "__main__":
     main()

test_feedback_pipeline.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import feedback_pipeline
+import content_resolver
 
 def test_build_completion():
     assert 1 == 1

test_root_log_function.py

@@ -1,6 +1,6 @@
 #! /usr/bin/python3
 
-from feedback_pipeline import Analyzer
+from content_resolver.analyzer import Analyzer
 import sys
 import urllib