feat: Fix mypy errors and refactor MergeMethod

Author: brucearctor

.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+{
+	"name": "SQLMesh",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"context": ".."
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/python:1": {
+			"version": "3.10"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "20"
+		}
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"esbenp.prettier-vscode"
+			]
+		}
+	},
+	"forwardPorts": [
+		8000,
+		8001
+	]
+}

.devcontainer/post-create.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Install node dependencies
+sudo -l "$(whoami)" -c "pnpm install"
+
+# Install python dependencies
+sudo -l "$(whoami)" -c "pip install -e '.[dev]'"

.gitlab-ci.yml

@@ -0,0 +1,19 @@
+
+stages:
+  - test
+
+test-vscode:
+  stage: test
+  image: node:22
+  script:
+    - pnpm install
+    - pnpm run ci
+
+test-gitlab-integration:
+  stage: test
+  image: python:3.12
+  before_script:
+    - pip install poetry
+    - poetry install --no-root
+  script:
+    - poetry run pytest tests/integrations/gitlab/cicd/

.pre-commit-config.yaml

@@ -17,8 +17,86 @@ repos:
         files: *files
       - id: mypy
         name: mypy
-        language: system
+        language: python
         entry: mypy
+        additional_dependencies: [
+          "mypy~=1.13.0",
+          "pydantic>=2.0.0",
+          "astor",
+          "click",
+          "croniter",
+          "duckdb>=0.10.0,!=0.10.3",
+          "dateparser<=1.2.1",
+          "hyperscript>=0.1.0",
+          "ipywidgets",
+          "jinja2",
+          "packaging",
+          "pandas",
+          "python-dotenv",
+          "requests",
+          "rich[jupyter]",
+          "ruamel.yaml",
+          "sqlglot[rs]~=27.8.0",
+          "tenacity",
+          "time-machine",
+          "json-stream",
+          "agate==1.7.1",
+          "beautifulsoup4",
+          "clickhouse-connect",
+          "cryptography",
+          "databricks-sql-connector",
+          "dbt-bigquery",
+          "dbt-core",
+          "dbt-duckdb>=1.7.1",
+          "dbt-snowflake",
+          "dbt-athena-community",
+          "dbt-clickhouse",
+          "dbt-databricks",
+          "dbt-redshift",
+          "dbt-trino",
+          "Faker",
+          "google-auth",
+          "google-cloud-bigquery",
+          "google-cloud-bigquery-storage",
+          "httpx",
+          "pandas-stubs",
+          "pre-commit",
+          "psycopg2-binary",
+          "PyAthena[Pandas]",
+          "PyGithub>=2.6.0",
+          "python-gitlab>=4.0.0",
+          "pyodbc>=5.0.0",
+          "pyperf",
+          "pyspark~=3.5.0",
+          "pytest",
+          "pytest-asyncio",
+          "pytest-mock",
+          "pytest-retry",
+          "pytest-xdist",
+          "pytz",
+          "redshift_connector",
+          "ruff~=0.11.0",
+          "snowflake-connector-python[pandas,secure-local-storage]>=3.0.2",
+          "sqlalchemy-stubs",
+          "trino",
+          "types-croniter",
+          "types-dateparser",
+          "types-PyMySQL",
+          "types-python-dateutil",
+          "types-pytz",
+          "types-requests==2.28.8",
+          "typing-extensions",
+          "pygls>=1.2.0,<2.0.0",
+          "lsprotocol",
+          "fastapi==0.115.5",
+          "watchfiles>=0.19.0",
+          "uvicorn[standard]==0.22.0",
+          "sse-starlette>=0.2.2",
+          "pyarrow",
+          "starlette>=0.27.0",
+          "httptools",
+          "websockets"
+        ]
         "types": [python]
         files: *files
         require_serial: true

Makefile

@@ -96,6 +96,9 @@ dbt-test:
 github-test:
 	pytest -n auto -m "github"
 
+gitlab-test:
+	pytest -n auto -m "gitlab"
+
 jupyter-test:
 	pytest -n auto -m "jupyter"
 

docs/installation.md

@@ -37,6 +37,7 @@ Some extras add features, like the SQLMesh VSCode extension or Github CI/CD bot:
     | ------------------- | ------------------------------- |
     | VSCode extension    | `pip install "sqlmesh[lsp]"`    |
     | Github CI/CD bot    | `pip install "sqlmesh[github]"` |
+    | Gitlab CI/CD bot    | `pip install "sqlmesh[gitlab]"` |
     | dbt projects        | `pip install "sqlmesh[dbt]"`    |
     | dlt projects        | `pip install "sqlmesh[dlt]"`    |
     | Slack notifications | `pip install "sqlmesh[slack]"`  |

docs/integrations/github.md

@@ -97,7 +97,8 @@ Regardless of signal approach being used, the bot needs to be configured to use
 === "Python"
 
     ```python linenums="1"
-    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig, MergeMethod
+    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig
+from sqlmesh.core.cicd.config import MergeMethod
     from sqlmesh.core.config import Config
 
     config = Config(
@@ -188,7 +189,8 @@ This command must be enabled in the bot's configuration.
 === "Python"
 
     ```python linenums="1"
-    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig, MergeMethod
+    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig
+from sqlmesh.core.cicd.config import MergeMethod
     from sqlmesh.core.config import Config
     
     config = Config(
@@ -327,7 +329,8 @@ Example with all properties defined:
 === "Python"
 
     ```python linenums="1"
-    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig, MergeMethod
+    from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig
+from sqlmesh.core.cicd.config import MergeMethod
     from sqlmesh.core.config import AutoCategorizationMode, CategorizerConfig, Config
     
     config = Config(

docs/integrations/gitlab.md

@@ -0,0 +1,46 @@
+# GitLab Integration
+
+SQLMesh can be integrated with GitLab to provide a seamless CI/CD experience for your data projects. This integration allows you to run SQLMesh commands directly from your GitLab merge requests, and to get feedback on the status of your data models.
+
+## Setup
+
+To set up the GitLab integration, you need to do the following:
+
+1.  **Create a GitLab private token.** You can create a private token in your GitLab user settings. The token needs to have the `api` scope.
+2.  **Add the private token to your GitLab CI/CD variables.** Add the token as a masked variable named `GITLAB_PRIVATE_TOKEN` in your project's CI/CD settings.
+3.  **Configure the SQLMesh bot.** You need to add a `cicd_bot` section to your `config.yml` file. The following is an example configuration:
+
+```yaml
+cicd_bot:
+  type: gitlab
+  project_id: <your-project-id>
+  enable_deploy_command: true
+```
+
+## Usage
+
+Once the GitLab integration is set up, you can use the following commands in your merge request comments:
+
+-   `/deploy`: Deploys the changes in the merge request to the production environment.
+
+## CI/CD Pipeline
+
+The following is an example of a GitLab CI/CD pipeline that uses the SQLMesh GitLab integration:
+
+```yaml
+stages:
+  - test
+  - deploy
+
+sqlmesh_checks:
+  stage: test
+  script:
+    - sqlmesh gitlab run-all-checks --token $GITLAB_PRIVATE_TOKEN
+
+sqlmesh_deploy:
+  stage: deploy
+  script:
+    - sqlmesh gitlab run-deploy-command --token $GITLAB_PRIVATE_TOKEN
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE == "note"'
+```

docs/integrations/overview.md

@@ -6,6 +6,7 @@ SQLMesh supports integrations with the following tools:
 * [dbt](dbt.md)
 * [dlt](dlt.md)
 * [GitHub Actions](github.md)
+* [GitLab](gitlab.md)
 * [Kestra](https://kestra.io/plugins/plugin-sqlmesh/tasks/cli/io.kestra.plugin.sqlmesh.cli.sqlmeshcli)
 
 ## Execution engines