[EXPERIMENTAL] Merge main (#1139)

# Description

Please describe the change you have made.

## Bump

- [ ] Patch
- [ ] Minor
- [x] Skip

## Changelog
### Added

- My change.

---------

Co-authored-by: Nikola Vasiljevic <35523348+nikokaoja@users.noreply.github.com>
Co-authored-by: Anders Albert <60234212+doctrino@users.noreply.github.com>

Author: 3 people

cognite/neat/_rules/models/entities/_wrapped.py

@@ -107,12 +107,20 @@ def from_dms_filter(cls, filter: dm.Filter) -> "DMSFilter":
             (body := dumped.get(dm.filters.Equals._filter_name))
             and (value := body.get("value"))
             and isinstance(value, dict)
+            and (space := value.get("space"))
+            and (external_id := value.get("externalId"))
+        ):
+            return NodeTypeFilter(inner=[DMSNodeEntity(space=space, externalId=external_id)])
+        elif (
+            (body := dumped.get(dm.filters.In._filter_name))
+            and (values := body.get("values"))
+            and all(
+                [
+                    (True if isinstance(entry, dict) and "space" in entry and "externalId" in entry else False)
+                    for entry in values
+                ]
+            )
         ):
-            space = value.get("space")
-            external_id = value.get("externalId")
-            if space is not None and external_id is not None:
-                return NodeTypeFilter(inner=[DMSNodeEntity(space=space, externalId=external_id)])
-        elif (body := dumped.get(dm.filters.In._filter_name)) and (values := body.get("values")):
             return NodeTypeFilter(
                 inner=[
                     DMSNodeEntity(space=entry["space"], externalId=entry["externalId"])

dev.py

@@ -21,7 +21,10 @@
 CHANGELOG_ENTRY_FILE = REPO_ROOT / "last_changelog_entry.md"
 LAST_VERSION = REPO_ROOT / "last_version.txt"
 VERSION_PLACEHOLDER = "0.0.0"
-
+VERSION_FILES = (
+    REPO_ROOT / "pyproject.toml",
+    REPO_ROOT / "cognite" / "neat" / "_version.py",
+)
 
 dev_app = typer.Typer(
     add_completion=False,
@@ -34,10 +37,6 @@
 
 @dev_app.command()
 def bump(verbose: bool = False) -> None:
-    version_files = [
-        REPO_ROOT / "pyproject.toml",
-        REPO_ROOT / "cognite" / "neat" / "_version.py",
-    ]
     last_version_str = LAST_VERSION.read_text().strip().removeprefix("v")
     try:
         last_version = parse(last_version_str)
@@ -60,12 +59,12 @@ def bump(verbose: bool = False) -> None:
     else:
         raise typer.BadParameter("You must specify one of major, minor, patch, alpha, or beta.")
 
-    for file in version_files:
+    for file in VERSION_FILES:
         file.write_text(file.read_text().replace(str(VERSION_PLACEHOLDER), str(new_version), 1))
         if verbose:
             typer.echo(f"Bumped version from {last_version} to {new_version} in {file}.")
 
-    typer.echo(f"Bumped version from {last_version} to {new_version} in {len(version_files)} files.")
+    typer.echo(f"Bumped version from {last_version} to {new_version} in {len(VERSION_FILES)} files.")
 
 
 @dev_app.command("changelog")
@@ -95,6 +94,11 @@ def _read_last_commit_message() -> tuple[str, str | None]:
         return after_bump, None
 
     bump_text, changelog_text = after_bump.split("## Changelog")
+
+    if "-----" in changelog_text:
+        # Co-authors section
+        changelog_text = changelog_text.split("-----")[0].strip()
+
     return bump_text, changelog_text
 
 

tests/tests_unit/test_neat_package_metadata.py

@@ -1,5 +1,9 @@
 from pathlib import Path
+from unittest.mock import MagicMock
 
+import pytest
+
+import dev
 from tests.config import ROOT
 
 
@@ -17,3 +21,111 @@ def test_no_spaces_in_sub_folders() -> None:
                     raise ValueError(f"Subfolder with spaces found: {path}")
 
     assert not name_by_location, f"Subfolders with spaces found: {name_by_location}"
+
+
+def get_release_process_test_cases():
+    yield pytest.param(
+        """NEAT-899 Remove  template. solution_model()  (#1096)
+
+# Description
+
+Removing `template.solution_model()` as it is not robust to be public
+method
+
+## Bump
+
+- [X] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+###  Removed
+
+- Removed `template.solution_model()` as it is not robust to be public
+method
+        """,
+        "0.119.8\n",
+        """
+###  Removed
+
+- Removed `template.solution_model()` as it is not robust to be public
+method""",
+        "0.119.9",
+        id="Patch bump",
+    )
+
+    yield pytest.param(
+        """Enable dummy property per user defined concept (#1079)
+# Description
+
+Enable adding dummy property for every user-defined concept when
+creating extension template.
+By default dummy property is formed as `idOfConceptGUID` , and it set to
+be string, none mandatory.
+Dummy properties help in avoiding to set filters in DMS.
+
+## Bump
+
+- [ ] Patch
+- [x] Minor
+- [ ] Skip
+
+## Changelog
+### Added
+- Support for dummy properties in `template.extension()`
+
+---------
+
+Co-authored-by: Member <member@users.noreply.github.com>
+Co-authored-by: Member <member@cognite.com>""",
+        "0.119.8\n",
+        """### Added
+- Support for dummy properties in `template.extension()`""",
+        "0.120.0",
+        id="Minor bump with co-authors",
+    )
+
+
+class TestReleaseProcess:
+    @pytest.mark.parametrize(
+        "last_git_message, last_version, expected_changelog, expected_version", list(get_release_process_test_cases())
+    )
+    def test_bump_and_create_changelog_entry(
+        self, last_git_message: str, last_version: str, expected_changelog: str, expected_version: str, monkeypatch
+    ) -> None:
+        actual_changelog_entry: str | None = None
+        actual_version: str | None = None
+        last_git_message_file = MagicMock(spec=Path)
+        last_git_message_file.read_text.return_value = last_git_message
+        last_version_file = MagicMock(spec=Path)
+        last_version_file.read_text.return_value = last_version
+
+        def mock_write_changelog(content, encoding=None):
+            nonlocal actual_changelog_entry
+            actual_changelog_entry = content
+
+        changelog_file = MagicMock(spec=Path)
+        changelog_file.write_text = mock_write_changelog
+
+        version_file = MagicMock(spec=Path)
+        version_file.read_text.return_value = dev.VERSION_PLACEHOLDER
+
+        def mock_write_version(content, **_):
+            nonlocal actual_version
+            actual_version = content
+
+        version_file.write_text = mock_write_version
+
+        monkeypatch.setattr(dev, "LAST_GIT_MESSAGE_FILE", last_git_message_file)
+        monkeypatch.setattr(dev, "LAST_VERSION", last_version_file)
+        monkeypatch.setattr(dev, "CHANGELOG_ENTRY_FILE", changelog_file)
+        monkeypatch.setattr(dev, "VERSION_FILES", [version_file])
+
+        dev.bump()
+        dev.create_changelog_entry()
+
+        assert actual_changelog_entry is not None, "Changelog entry was not created"
+        assert actual_changelog_entry == expected_changelog
+
+        assert actual_version is not None, "Version was not updated"
+        assert actual_version == expected_version

tests/tests_unit/test_rules/test_models/test_wrapped_entities.py

@@ -106,7 +106,10 @@ def test_load(self, cls_: type[WrappedEntity], raw: Any, expected: WrappedEntity
             (
                 dm.filters.In(
                     ["node", "type"],
-                    [{"space": "space", "externalId": "node1"}, {"space": "space", "externalId": "node2"}],
+                    [
+                        {"space": "space", "externalId": "node1"},
+                        {"space": "space", "externalId": "node2"},
+                    ],
                 ),
                 NodeTypeFilter(
                     inner=[
@@ -115,6 +118,28 @@ def test_load(self, cls_: type[WrappedEntity], raw: Any, expected: WrappedEntity
                     ]
                 ),
             ),
+            (
+                dm.filters.In(
+                    property=["cdf_cdm", "CogniteFile", "mimeType"],
+                    values=[
+                        "application/pdf",
+                        "application/msword",
+                        "image/jpeg",
+                        "image/tiff",
+                        "image/png",
+                        "application/vnd.ms-excel",
+                        "application/vnd.ms-excel.sheet.macroEnabled.12",
+                    ],
+                ),
+                RawFilter(
+                    filter=(
+                        'rawFilter({"in": {"property": ["cdf_cdm", "CogniteFile", "mimeType"], '
+                        '"values": ["application/pdf", "application/msword", "image/jpeg", '
+                        '"image/tiff", "image/png", "application/vnd.ms-excel", '
+                        '"application/vnd.ms-excel.sheet.macroEnabled.12"]}})'
+                    )
+                ),
+            ),
             pytest.param(
                 dm.filters.Equals(["govern-space", "Property", "type"], "Input"),
                 RawFilter(filter='{"equals": {"property": ["govern-space", "Property", "type"], "value": "Input"}}'),