fixup! fixup! jira

wip

Author: bgaidioz

examples/jira/python/jira_endpoints.py

@@ -147,8 +147,7 @@ def _safe_get(obj, key, default=None):
             "name": _safe_get(fields.get('project'), 'name')
         },
         "parent": _safe_get(fields.get('parent'), 'key'),
-        "url": f"{jira_url}/browse/{issue.get('key')}",
-        "self": issue.get('self')
+        "url": f"{jira_url}/browse/{issue.get('key')}"
     }
 
     return cleaned_issue
@@ -162,7 +161,7 @@ def get_user(account_id: str) -> Dict[str, Any]:
                    Example: "557058:ab168c94-8485-405c-88e6-6458375eb30b"
 
     Returns:
-        Dictionary containing the user details
+        Dictionary containing filtered user details
         
     Raises:
         ValueError: If user is not found or account ID is invalid
@@ -172,7 +171,15 @@ def get_user(account_id: str) -> Dict[str, Any]:
 
     # Get user by account ID - pass as account_id parameter for Jira Cloud
     user = jira.user(account_id=account_id)
-    return user
+    
+    # Return only the requested fields
+    return {
+        "accountId": user.get("accountId"),
+        "displayName": user.get("displayName"),
+        "emailAddress": user.get("emailAddress"),
+        "active": user.get("active"),
+        "timeZone": user.get("timeZone")
+    }
 
 
 def search_user(query: str) -> List[Dict[str, Any]]:
@@ -183,15 +190,29 @@ def search_user(query: str) -> List[Dict[str, Any]]:
                Examples: "ben@raw-labs.com", "Benjamin Gaidioz", "ben", "benjamin", "gaidioz"
 
     Returns:
-        List of matching users. Empty list if no matches found.
+        List of matching users with filtered fields. Empty list if no matches found.
     """
     logger.info("Searching for users with query: %s", query)
     jira = _get_jira_client()
 
     # user_find_by_user_string returns a list of users matching the query
     users = jira.user_find_by_user_string(query=query)
 
-    return users or []
+    if not users:
+        return []
+    
+    # Filter users to only include relevant fields
+    filtered_users = []
+    for user in users:
+        filtered_users.append({
+            "accountId": user.get("accountId"),
+            "displayName": user.get("displayName"),
+            "emailAddress": user.get("emailAddress"),
+            "active": user.get("active"),
+            "timeZone": user.get("timeZone")
+        })
+    
+    return filtered_users
 
 
 def list_projects() -> List[Dict[str, Any]]:
@@ -203,7 +224,7 @@ def list_projects() -> List[Dict[str, Any]]:
     logger.info("Listing all projects")
 
     jira = _get_jira_client()
-    raw_projects: List[Dict[str, Any]] = jira.projects()
+    raw_projects: List[Dict[str, Any]] = jira.projects(expand="lead")
 
     def safe_name(obj: Optional[Dict[str, Any]]) -> Optional[str]:
         return obj.get("displayName") or obj.get("name") if obj else None
@@ -303,8 +324,7 @@ def get_project_roles(project_key: str) -> List[Dict[str, Any]]:
 
             result.append({
                 "name": role_name,
-                "id": role_id,
-                "url": role_url
+                "id": role_id
             })
 
         return result

examples/jira/tools/get_issue.yml

@@ -106,9 +106,6 @@ tool:
       url:
         type: string
         description: The issue URL
-      self:
-        type: string
-        description: The API self link
   tests:
     - name: "Get issue by key"
       description: "Verify issue retrieval returns expected structure"

examples/jira/tools/get_project_roles.yml

@@ -37,9 +37,6 @@ tool:
         id:
           type: string
           description: The role ID
-        url:
-          type: string
-          description: The role URL
   tests:
     - name: "Get project roles"
       description: "Verify project roles returns array of roles"

examples/jira/tools/get_user.yml

@@ -42,9 +42,9 @@ tool:
       active:
         type: boolean
         description: Whether the user is active
-      self:
+      timeZone:
         type: string
-        description: The API self link
+        description: The user's time zone
   tests:
     - name: "Get user by account ID"
       description: "Just run the tool"

examples/jira/tools/jql_query.yml

@@ -45,6 +45,7 @@ tool:
         If not specified, returns all matching results.
         Recommended to use with start parameter for pagination.
       examples: [50, 100, 200]
+      default: null
   return:
     type: array
     items:

examples/jira/tools/search_user.yml

@@ -45,9 +45,9 @@ tool:
         active:
           type: boolean
           description: Whether the user is active
-        self:
+        timeZone:
           type: string
-          description: The API self link
+          description: The user's time zone
   tests:
     - name: "Search by name"
       description: "Verify user search by name returns results"

examples/salesforce/python/salesforce_endpoints.py

@@ -99,19 +99,32 @@ def search(search_term: str) -> List[Dict[str, Any]]:
     return sosl(sosl_query)
 
 
-def list_sobjects() -> List[str]:
-    """Get a list of all available Salesforce objects.
+def list_sobjects(filter: Optional[str] = None) -> List[str]:
+    """List all available Salesforce objects (sObjects) in the org.
+    
+    Args:
+        filter: Optional fuzzy filter to match object names (case-insensitive substring search).
+                Examples: "account", "__c" for custom objects, "contact", etc.
     
     Returns:
-        List of object names from the org
-        
-    Example:
-        >>> list_sobjects()  # Returns ['Account', 'Contact', ...]
+        list: List of Salesforce object names as strings
     """
-    logger.info("Listing all Salesforce objects")
-    
     sf = _get_salesforce_client()
-    return [obj['name'] for obj in sf.describe()['sobjects']]
+        
+    describe_result = sf.describe()
+        
+    object_names = [obj['name'] for obj in describe_result['sobjects']]
+        
+    if filter is not None and filter.strip():
+        filter_lower = filter.lower()
+        object_names = [
+            name for name in object_names 
+            if filter_lower in name.lower()
+        ]
+        
+    object_names.sort()
+        
+    return object_names
 
 
 def describe_sobject(sobject_name: str) -> Dict[str, Any]:
@@ -156,11 +169,6 @@ def describe_sobject(sobject_name: str) -> Dict[str, Any]:
 
     return fields_info
 
-
-    
-    return result
-
-
 def get_sobject(sobject_name: str, record_id: str) -> Dict[str, Any]:
     """Get a specific Salesforce object by its ID.
     
@@ -177,6 +185,17 @@ def get_sobject(sobject_name: str, record_id: str) -> Dict[str, Any]:
     logger.info("Getting Salesforce object: %s with ID: %s", sobject_name, record_id)
 
     sf = _get_salesforce_client()
-    result = sf.__getattr__(sobject_name).get(record_id)
+    
+    # Try to get the object - catch this specifically for "object doesn't exist"
+    try:
+        sobject = getattr(sf, sobject_name)
+    except AttributeError:
+        raise Exception(f"Salesforce object '{sobject_name}' does not exist")
+    
+    result = sobject.get(record_id)
+    
+    # Remove 'attributes' field for consistency with other functions
+    if isinstance(result, dict) and 'attributes' in result:
+        result = {k: v for k, v in result.items() if k != 'attributes'}
 
     return result 

examples/salesforce/tools/list_sobjects.yml

@@ -6,7 +6,15 @@ tool:
   language: python
   source:
     file: ../python/salesforce_endpoints.py
-  parameters: []
+  parameters:
+    - name: filter
+      type: string
+      description: "Optional fuzzy filter to match object names (case-insensitive substring search). Examples: 'account', '__c' for custom objects, 'contact', etc. If not provided, all objects are returned."
+      examples:
+        - "account"
+        - "__c"
+        - "contact"
+      default: null
   return:
     type: array
     items: