Merge pull request #7 from paywithextend/use-extend-client

refactor: extend client, org id, update params

Author: byjoh

Makefile

@@ -5,27 +5,15 @@ ENV ?= stage
 
 venv: $(VENV_NAME)/bin/activate
 
-$(VENV_NAME)/bin/activate: requirements.txt
+$(VENV_NAME)/bin/activate: pyproject.toml
 	@test -d $(VENV_NAME) || $(PYTHON) -m venv $(VENV_NAME)
-	$(VENV_NAME)/bin/python -m pip install -r requirements.txt
+	$(VENV_NAME)/bin/python -m pip install -e .
 	@touch $(VENV_NAME)/bin/activate
 
 test: venv
 	$(VENV_NAME)/bin/python -m unittest discover tests
 
-build: set-config venv
+build: venv
 	cp LICENSE LICENSE.bak
 	$(VENV_NAME)/bin/python -m build
 	rm LICENSE.bak
-
-set-config:
-ifeq ($(ENV), stage)
-	@cp extend_ai_toolkit/config/config_stage.py extend_ai_toolkit/config/config.py
-	@echo "Using STAGING configuration"
-else ifeq ($(ENV), prod)
-	@cp extend_ai_toolkit/config/config_prod.py extend_ai_toolkit/config/config.py
-	@echo "Using PRODUCTION configuration"
-else
-	@echo "Invalid ENV value. Use 'stage' or 'prod'."
-	@exit 1
-endif

README.md

@@ -32,10 +32,16 @@ pip install extend_ai_toolkit@git+https://github.com/paywithextend/extend-ai-too
 
 ## Usage
 
-The library needs to be configured with your Extend api key and api secret either through environment variables or command line arguments
+The library needs to be configured with your Extend api key, api secret, and organization id, either through environment variables or command line arguments
+
+```
+--api-key=your_api_key_here --api-secret=your_api_secret_here --org-id=your_org_id_here
+```
+or
 ```
 EXTEND_API_KEY=your_api_key_here
 EXTEND_API_SECRET=your_api_secret_here
+ORGANIZATION_ID=your_org_id_here
 ```
 
 ### Model Context Protocol 
@@ -68,7 +74,8 @@ On Windows: `%APPDATA%/Claude/claude_desktop_config.json`
     ],
     "env": {
       "EXTEND_API_KEY": "apik_XXXX",
-      "EXTEND_API_SECRET": "XXXXX"
+      "EXTEND_API_SECRET": "XXXXX",
+      "ORGANIZATION_ID": "org_XXXX"
     }
   }
 ```
@@ -80,12 +87,12 @@ For advanced scenarios like custom deployments or running without Claude, you ca
 
 STDIO Transport:
 ```
-python -m extend_ai_toolkit.modelcontextprotocol.main --tools=virtual_cards.read,credit_cards.read --api-key=apik_XXXX --api-secret=XXXX
+python -m extend_ai_toolkit.modelcontextprotocol.main --tools=virtual_cards.read,credit_cards.read --api-key=apik_XXXX --api-secret=XXXX --org-id=org_XXXX
 ```
 
 SSE Transport:
 ```
-python -m extend_ai_toolkit.modelcontextprotocol.main_sse --tools=virtual_cards.read,credit_cards.read --api-key=apik_XXXX --api-secret=XXXX
+python -m extend_ai_toolkit.modelcontextprotocol.main_sse --tools=virtual_cards.read,credit_cards.read --api-key=apik_XXXX --api-secret=XXXX --org-id=org_XXXX
 ```
 
 Additionally, You can connect to your SSE server using our custom MCP terminal client
@@ -109,13 +116,14 @@ load_dotenv()
 
 server = ExtendMCPServer(    
     api_key=os.environ.get("EXTEND_API_KEY"),
-    api_secret=s.environ.get("EXTEND_API_SECRET"),
+    api_secret=s.environ.get("EXTEND_API_SECRET"),    
     configuration=Configuration(
         product_permissions=[
             ProductPermissions(Product.VIRTUAL_CARDS, permissions=Permissions(create=True, update=True, read=True)),
             ProductPermissions(Product.CREDIT_CARDS, permissions=Permissions(read=True)),
             ProductPermissions(Product.TRANSACTIONS, permissions=Permissions(read=True)),
-        ]
+        ],
+        org_id=os.environ.get("EXTEND_API_SECRET")
     )
 )
 
@@ -152,17 +160,18 @@ llm = ChatOpenAI(
 )
 
 extend_langchain_toolkit = ExtendLangChainToolkit(
-    api_key="apik_...",
-    api_secret="...",
+    org_id=os.environ.get("EXTEND_API_SECRET"),    
+    api_key=os.environ.get("EXTEND_API_KEY"),
+    api_secret=s.environ.get("EXTEND_API_SECRET"),
     configuration=Configuration(
         product_permissions=[
             ProductPermissions(Product.VIRTUAL_CARDS, permissions=Permissions(create=True, update=True, read=True)),
             ProductPermissions(Product.CREDIT_CARDS, permissions=Permissions(read=True)),
             ProductPermissions(Product.TRANSACTIONS, permissions=Permissions(read=True)),
-        ]
+        ],
+        org_id=os.environ.get("EXTEND_API_SECRET")
     )
 )
-)
 
 tools = []
 tools.extend(extend_agent_toolkit.get_tools())

extend_ai_toolkit/config/__init__.py

@@ -1,5 +1,4 @@
 from extend_ai_toolkit.shared import (
-    Agent,
     AgentToolkit,
     Configuration,
     ExtendAPI,
@@ -11,14 +10,19 @@
 class ExtendLangChainToolkit(AgentToolkit[ExtendTool]):
 
     def __init__(
-            self, api_key: str, api_secret: str, configuration: Configuration = Configuration.all_tools()
+            self,
+            org_id: str,
+            api_key: str,
+            api_secret: str,
+            configuration: Configuration = Configuration.all_tools()
     ):
+        configuration.org_id = org_id
+
         super().__init__(
-            agent=Agent.LANGCHAIN,
             api_key=api_key,
             api_secret=api_secret,
             configuration=configuration
         )
 
-        def tool_for_agent(self, api: ExtendAPI, tool: Tool) -> ExtendTool:
-            return ExtendTool(api, tool)
+    def tool_for_agent(self, api: ExtendAPI, tool: Tool) -> ExtendTool:
+        return ExtendTool(api, tool)

extend_ai_toolkit/config/config.py

@@ -1,7 +1,8 @@
-from .options import Options
+from .options import Options, validate_options
 from .server import ExtendMCPServer
 
 __all__ = [
     "ExtendMCPServer",
-    "Options"
+    "Options",
+    "validate_options"
 ]

extend_ai_toolkit/config/config_prod.py

@@ -13,7 +13,7 @@
 def build_server():
     options = Options.from_args((sys.argv[1:]), VALID_PRODUCT_PERMISSIONS)
     selected_tools = options.tools
-    configuration = Configuration.from_tool_str(selected_tools)
+    configuration = Configuration.from_tool_str(selected_tools, options.org_id)
 
     return ExtendMCPServer(
         api_key=options.api_key,

extend_ai_toolkit/config/config_stage.py

@@ -45,7 +45,7 @@ async def handle_sse(request: Request) -> None:
 def build_server():
     options = Options.from_args((sys.argv[1:]), VALID_PRODUCT_PERMISSIONS)
     selected_tools = options.tools
-    configuration = Configuration.from_tool_str(selected_tools)
+    configuration = Configuration.from_tool_str(selected_tools, options.org_id)
 
     return ExtendMCPServer(
         api_key=options.api_key,