gool 1.3.0__tar.gz → 1.3.2__tar.gz

{gool-1.3.0 → gool-1.3.2}/.gitlab-ci.yml

@@ -2,6 +2,7 @@ workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_TAG
 
 image: registry.gitlab.com/godardo/gool:2.0.0
 
@@ -14,6 +15,7 @@ stages:
   - check
   - build
   - static_analysis
+  - release
 
 check_all:
   stage: check
@@ -76,3 +78,35 @@ sonarcloud-check:
     # sonar new baseline if the new tag
     - sonar-scanner -Dsonar.projectVersion="$LATEST_TAG-next"
   allow_failure: false
+
+release_pypi:
+  stage: release
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - make build-and-publish
+    - make docs-test
+  pages:
+    #path_prefix: $CI_COMMIT_TAG #versioning only for premium gitlab
+    publish: build/doc
+
+publish_release_gitlab:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  needs:
+    - release_pypi
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - echo "running gitlab release_job" # mandatory script
+  release:
+    name: 'Release $CI_COMMIT_TAG'
+    description: 'Auto generated gitlab release' # put patch note here
+    tag_name: '$CI_COMMIT_TAG'
+    ref: '$CI_COMMIT_SHA'
+    assets:
+      links:
+        - name: 'Release link'
+          url: 'https://pypi.org/project/gool/$CI_COMMIT_TAG'
+        - name: 'Documentation'
+          url: 'https://godardo.gitlab.io/gool/'

gool-1.3.2/.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "sonarsource.sonarlint-vscode",
+    "charliermarsh.ruff",
+    "davidanson.vscode-markdownlint",
+    "ms-python.python",
+    "ms-python.debugpy"
+  ]
+}

{gool-1.3.0 → gool-1.3.2}/Makefile

@@ -33,7 +33,7 @@ clean-build: ## Clean build artifacts
 .PHONY: publish
 publish: ## Publish a release to PyPI.
 	@echo "🚀 Publishing."
-	@uvx twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+	@uvx twine upload --repository-url https://upload.pypi.org/legacy/ dist/* --verbose
 
 .PHONY: build-and-publish
 build-and-publish: build publish ## Build and publish.

{gool-1.3.0 → gool-1.3.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: gool
-Version: 1.3.0
+Version: 1.3.2
 Summary: cli logs clustering
 Project-URL: Homepage, https://gitlab.com/godardo/gool
 Project-URL: Repository, https://gitlab.com/godardo/gool
-Project-URL: Documentation, https://gitlab.com/godardo/gool
+Project-URL: Documentation, https://godardo.gitlab.io/gool
 Author: Olivier GODARD
 License-File: LICENSE
 Keywords: python
@@ -192,7 +192,7 @@ Apache_2K_MonDec05.log ━━━━━━━━━━━━━━━━━━━
 23:04:06.391483 INFO     log_clustering : Running baseline clustering.                                                                                                             log_clustering.py:588
 23:04:06.406525 INFO     logs_miner : Processed 1051 lines in 0.01 seconds (79220.32 lines/second).                                                                                    logs_miner.py:164
 Apache_2K_SunDec04.log ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
-                         Missing from baseline
+                         Missing /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                            ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -200,7 +200,7 @@ Apache_2K_SunDec04.log ━━━━━━━━━━━━━━━━━━━
 │ [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11  │
 └─────────────────────────────────────────────────────────────────────┘
 
-                         Added from baseline
+                         Added /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                           ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -284,7 +284,7 @@ Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━
 13:21:05.756522 INFO     logs_miner : Loading configuration from /home/godardo/git/gool/tests/data/drain3_compare_baseline.ini                                                                                                             logs_miner.py:29
 13:21:05.776119 INFO     logs_miner : Processed 1051 lines in 0.02 seconds (59559.73 lines/second).                                                                                                                                       logs_miner.py:213
 Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
-                         Missing from baseline
+                         Missing /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                            ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -292,7 +292,7 @@ Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━
 │ [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11  │
 └─────────────────────────────────────────────────────────────────────┘
 
-                         Added from baseline
+                         Added /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                           ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩

{gool-1.3.0 → gool-1.3.2}/README.md

@@ -167,7 +167,7 @@ Apache_2K_MonDec05.log ━━━━━━━━━━━━━━━━━━━
 23:04:06.391483 INFO     log_clustering : Running baseline clustering.                                                                                                             log_clustering.py:588
 23:04:06.406525 INFO     logs_miner : Processed 1051 lines in 0.01 seconds (79220.32 lines/second).                                                                                    logs_miner.py:164
 Apache_2K_SunDec04.log ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
-                         Missing from baseline
+                         Missing /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                            ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -175,7 +175,7 @@ Apache_2K_SunDec04.log ━━━━━━━━━━━━━━━━━━━
 │ [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11  │
 └─────────────────────────────────────────────────────────────────────┘
 
-                         Added from baseline
+                         Added /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                           ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -259,7 +259,7 @@ Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━
 13:21:05.756522 INFO     logs_miner : Loading configuration from /home/godardo/git/gool/tests/data/drain3_compare_baseline.ini                                                                                                             logs_miner.py:29
 13:21:05.776119 INFO     logs_miner : Processed 1051 lines in 0.02 seconds (59559.73 lines/second).                                                                                                                                       logs_miner.py:213
 Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
-                         Missing from baseline
+                         Missing /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                            ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
@@ -267,7 +267,7 @@ Apache_2k.log ━━━━━━━━━━━━━━━━━━━━━━
 │ [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11  │
 └─────────────────────────────────────────────────────────────────────┘
 
-                         Added from baseline
+                         Added /baseline
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Template                                                           ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩

{gool-1.3.0 → gool-1.3.2}/mkdocs.yml

@@ -6,6 +6,7 @@ site_author: Olivier GODARD
 edit_uri: edit/main/docs/
 repo_name: leCapi/gool
 copyright: Maintained by <a href="https://gitlab.com/godardo/gool">leCapi</a>.
+site_dir: build/doc
 
 nav:
   - Home: index.md

{gool-1.3.0 → gool-1.3.2}/pyproject.toml

@@ -29,7 +29,7 @@ gool = "gool.log_clustering:main_cli"
 [project.urls]
 Homepage = "https://gitlab.com/godardo/gool"
 Repository = "https://gitlab.com/godardo/gool"
-Documentation = "https://gitlab.com/godardo/gool"
+Documentation = "https://godardo.gitlab.io/gool"
 
 [dependency-groups]
 dev = [

{gool-1.3.0 → gool-1.3.2}/src/gool/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.3.2'
+__version_tuple__ = version_tuple = (1, 3, 2)
 
 __commit_id__ = commit_id = None

{gool-1.3.0 → gool-1.3.2}/src/gool/log_clustering.py

@@ -169,7 +169,7 @@ def display_diff_baseline(
             console.print(f"{item}", soft_wrap=True, markup=False)
         print()
 
-    def display_data(list_data: list[str], header: str) -> None:
+    def display_data_rich(list_data: list[str], header: str) -> None:
         table = Table(title=header, highlight=True)
         table.add_column("Template", justify="left")
         for item in list_data:
@@ -178,16 +178,16 @@ def display_diff_baseline(
         console.print(table, markup=False)
         print()
 
-    if raw:
-        display_data_raw(missing, "Missing from baseline")
-        display_data_raw(added, "Added from baseline")
-        if display_common:
-            display_data_raw(common, "Common with baseline")
-    else:
-        display_data(missing, "Missing from baseline")
-        display_data(added, "Added from baseline")
-        if display_common:
-            display_data(common, "Common with baseline")
+    def display_data(raw: bool, list_data: list[str], header: str) -> None:
+        if raw:
+            display_data_raw(list_data, header)
+        else:
+            display_data_rich(list_data, header)
+
+    display_data(raw, missing, "Missing /baseline")
+    display_data(raw, added, "Added /baseline")
+    if display_common:
+        display_data(raw, common, "Common with baseline")
 
 
 def display_clusters(
@@ -359,8 +359,8 @@ def main(args: Arguments) -> int:
 
     if args.baseline:
         base_filter_regexp = re.compile(args.base_filter) if args.base_filter else filter_regexp
-        base_time_min = datetime.strptime(args.base_time_min, time_format) if args.time_min else time_min
-        base_time_max = datetime.strptime(args.base_time_max, time_format) if args.time_max else time_max
+        base_time_min = datetime.strptime(args.base_time_min, time_format) if args.base_time_min else time_min
+        base_time_max = datetime.strptime(args.base_time_max, time_format) if args.base_time_max else time_max
         logging.info("Running baseline clustering.")
         bl_runner, bl_total_nb_lines = _create_and_run_miner(
             drain3_cfg_file,

{gool-1.3.0 → gool-1.3.2}/src/gool/logs_miner.py

@@ -116,11 +116,11 @@ class LogsMiner:
         baseline_clusters = {cluster.get_template() for cluster in baseline_miner.template_miner.drain.clusters}
         clusters = {cluster.get_template() for cluster in miner.template_miner.drain.clusters}
 
-        missing_from_baseline = baseline_clusters - clusters
-        added_from_baseline = clusters - baseline_clusters
+        missing_vs_baseline = baseline_clusters - clusters
+        added_vs_baseline = clusters - baseline_clusters
         common = baseline_clusters & clusters
 
-        return sorted(missing_from_baseline), sorted(added_from_baseline), sorted(common)
+        return sorted(missing_vs_baseline), sorted(added_vs_baseline), sorted(common)
 
     def get_total_nb_lines_clusters(self) -> int:
         """

{gool-1.3.0 → gool-1.3.2}/tests/data/results/Apache_2K_baseline_compare.txt

@@ -1,8 +1,8 @@
-Missing from baseline:
+Missing /baseline:
 [<TIME>] [notice] jk2 init() Found child 1568 in scoreboard slot 13
 [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11
 
-Added from baseline:
+Added /baseline:
 [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 13
 
 Log Clusters

{gool-1.3.0 → gool-1.3.2}/tests/data/results/Apache_2K_baseline_compare_common.txt

@@ -1,8 +1,8 @@
-Missing from baseline:
+Missing /baseline:
 [<TIME>] [notice] jk2 init() Found child 1568 in scoreboard slot 13
 [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 11
 
-Added from baseline:
+Added /baseline:
 [<TIME>] [notice] jk2 init() Found child <*> in scoreboard slot 13
 
 Common with baseline: