Skip to content

Allow make commands to be run on a single project #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cboffa13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow make commands to be run on a single project #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
SUBDIRS := $(filter-out src/dbtools-mcp-server src/mysql-mcp-server src/oci-pricing-mcp-server src/oracle-db-doc-mcp-server,$(wildcard src/*))
SOURCE_FOLDER := src
# These directories will be excluded from common cmds like build, install, test etc
EXCLUDED_PROJECTS := dbtools-mcp-server mysql-mcp-server oci-pricing-mcp-server oracle-db-doc-mcp-server
EXCLUDED_PROJECT_PATHS = $(addprefix $(SOURCE_FOLDER)/, $(EXCLUDED_PROJECTS))
# This matches all paths by default. If you want to run a command on a specific package you can specify the `project` variable
project ?= *
# These are the directories that will be built
DIRS := $(wildcard $(SOURCE_FOLDER)/$(project))
SUBDIRS := $(filter-out $(EXCLUDED_PROJECT_PATHS), $(DIRS))

Copy link
Member

@irfan-ahmed irfan-ahmed Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just keep it simple with

SUBDIRS := $(filter-out src/dbtools-mcp-server src/mysql-mcp-server src/oci-pricing-mcp-server src/oracle-db-doc-mcp-server,$(wildcard src/*))
SUBDIRS ?= $(filter-out src/dbtools-mcp-server src/mysql-mcp-server src/oci-pricing-mcp-server src/oracle-db-doc-mcp-server,$(wildcard src/*))

Copy link
Member

@irfan-ahmed irfan-ahmed Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can then run the commands with the following

SUBDIRS=src/oci-api-mcp-server make build

Copy link
Member

@banderson-oracle banderson-oracle Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The complexity here possibly seems a bit overkill, but it's also been about 16 years since I've used Make, so I can't really say much meaningful in terms of what I would suggest to make it simpler.
However, I would prefer something even more simple for consumers, like make project=compute build and have the other parts added.

Copy link
Member

@shopewf shopewf Jan 9, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the benefit to @cboffa13's approach here is you dont have to write src/ on the start of the project you wanna build. Since the src variable was defined at the top of the Makefile to make that happen, he decided to reuse it with the other excluded_projects.

.PHONY: test format
Copy link
Member

@irfan-ahmed irfan-ahmed Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one issue, though. If you were to run the test target using a project such as oci-cloud-guard-mcp-server where the individual coverage is less than the overall coverage figure of 69, the result is a failure, where it is actually not a failure.

 $ make project=oci-cloud-guard-mcp-server test
Testing src/oci-cloud-guard-mcp-server
warning: `VIRTUAL_ENV=/Users/irahmed/development/projects/oci-console/fork-oracle-mcp/.venv` does not match the project environment path `.venv` and will be ignored; use `--active` to target the active environment instead
========================================== test session starts ===========================================
platform darwin -- Python 3.13.7, pytest-9.0.2, pluggy-1.6.0
rootdir: /Users/irahmed/development/projects/oci-console/oracle-mcp/src/oci-cloud-guard-mcp-server
configfile: pyproject.toml
plugins: anyio-4.12.0, asyncio-1.3.0, cov-7.0.0
asyncio: mode=Mode.STRICT, debug=False, asyncio_default_fixture_loop_scope=None, asyncio_default_test_loop_scope=function
collected 7 items

oracle/oci_cloud_guard_mcp_server/tests/test_cloud_guard_tools.py .......                          [100%]

============================================ warnings summary ============================================
.venv/lib/python3.13/site-packages/pydantic/json_schema.py:2442
  /Users/irahmed/development/projects/oci-console/oracle-mcp/src/oci-cloud-guard-mcp-server/.venv/lib/python3.13/site-packages/pydantic/json_schema.py:2442: PydanticJsonSchemaWarning: Default value typing.Literal['OPEN', 'RESOLVED', 'DISMISSED', 'DELETED', 'UNKNOWN_ENUM_VALUE'] is not JSON serializable; excluding default from JSON schema [non-serializable-default]
    warnings.warn(message, PydanticJsonSchemaWarning)

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
============================================= tests coverage =============================================
____________________________ coverage: platform darwin, python 3.13.7-final-0 ____________________________

Name                                          Stmts   Miss Branch BrPart   Cover   Missing
------------------------------------------------------------------------------------------
oracle/oci_cloud_guard_mcp_server/models.py      72     22     14      1  59.30%   16-28, 167-169, 180-183, 243-245
oracle/oci_cloud_guard_mcp_server/server.py      59     13     12      4  76.06%   29-42, 77, 78->80, 81, 141
------------------------------------------------------------------------------------------
TOTAL                                           131     35     26      5  66.88%
Coverage HTML written to dir htmlcov
Required test coverage of 64.8% reached. Total coverage: 66.88%
====================================== 7 passed, 1 warning in 1.77s ======================================
/Library/Developer/CommandLineTools/usr/bin/make combine-coverage
uv run coverage combine
Combined data file .coverage.oci-cloud-guard-mcp-server
uv run coverage html
Wrote HTML report to htmlcov/index.html
uv run coverage report --fail-under=69
Name                                                                         Stmts   Miss Branch BrPart  Cover
--------------------------------------------------------------------------------------------------------------
src/oci-cloud-guard-mcp-server/oracle/oci_cloud_guard_mcp_server/models.py      72     22     14      1    59%
src/oci-cloud-guard-mcp-server/oracle/oci_cloud_guard_mcp_server/server.py      59     13     12      4    76%
--------------------------------------------------------------------------------------------------------------
TOTAL                                                                          131     35     26      5    67%
Coverage failure: total of 67 is less than fail-under=69
make[1]: *** [combine-coverage] Error 2
make: *** [test] Error 2

Copy link
Member Author

@cboffa13 cboffa13 Jan 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah this is because we are combining the code coverage of all the servers. tbh i think this is a good thing and will force us to meet a minimum coverage bar

Copy link
Member

@irfan-ahmed irfan-ahmed Jan 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe if project is set, we should not combine. The failure above is a false positive. Users using this will see a failure and may start debugging it when it is not a failure, actually. That combined figure of 69 is for when we run test against all the MCP servers.


Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ This section will help you set up your environment to prepare it for local devel
make build
make install
```
**Note**: If you want to run commands in a single server project, you can add the `project` variable to only run commands for that specific project
For example: `make project=oci-compute-mcp-server build` will only build the compute mcp server

3. Add desired servers to your MCP client configuration, but run them using the locally installed server package instead

Expand Down