mc5-api-client 1.0.20__tar.gz → 1.0.21__tar.gz

{mc5_api_client-1.0.20/src/mc5_api_client.egg-info → mc5_api_client-1.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc5_api_client
-Version: 1.0.20
+Version: 1.0.21
 Summary: A comprehensive Python library for interacting with the Modern Combat 5 API
 Home-page: https://pypi.org/project/mc5-api-client/
 Author: Chizoba

{mc5_api_client-1.0.20 → mc5_api_client-1.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mc5_api_client"
-version = "1.0.20"
+version = "1.0.21"
 description = "A comprehensive Python library for interacting with the Modern Combat 5 API"
 readme = "README.md"
 license = {file = "LICENSE"}

{mc5_api_client-1.0.20 → mc5_api_client-1.0.21}/setup.py

@@ -33,7 +33,7 @@ def read_requirements():
 setup(
     name="mc5_api_client",
     use_scm_version=False,
-    version="1.0.20",
+    version="1.0.21",
     description="A comprehensive Python library for interacting with the Modern Combat 5 API",
     long_description=read_readme(),
     long_description_content_type="text/markdown",

{mc5_api_client-1.0.20 → mc5_api_client-1.0.21}/src/mc5_api_client/__init__.py

@@ -15,7 +15,7 @@ messaging, and more.
 
 from typing import Optional, Dict, Any
 
-__version__ = "1.0.20"
+__version__ = "1.0.21"
 __author__ = "Chizoba"
 __email__ = "chizoba2026@hotmail.com"
 __license__ = "MIT"
@@ -88,6 +88,37 @@ from .auth import TokenGenerator
 from .exceptions import MC5APIError, AuthenticationError, RateLimitError
 from .help import help, examples, quick_reference
 
+# Automatic Squad Management (NEW!)
+from .client import MC5Client
+
+# Add automatic squad management methods as standalone functions
+def get_my_squad_id(client=None, **kwargs):
+    """Get user's squad ID automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_id()
+
+def get_my_squad_info(client=None, **kwargs):
+    """Get user's squad information automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_info()
+
+def update_my_squad_info(client=None, **squad_kwargs):
+    """Update user's squad information automatically."""
+    client_kwargs = {k: v for k, v in squad_kwargs.items() if k in ['username', 'password', 'client_id']}
+    update_kwargs = {k: v for k, v in squad_kwargs.items() if k not in ['username', 'password', 'client_id']}
+    
+    if client is None:
+        client = MC5Client(**client_kwargs)
+    return client.update_my_squad_info(**update_kwargs)
+
+def get_my_squad_members(client=None, **kwargs):
+    """Get user's squad members automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_members()
+
 # Add MC5ApiClient as an alias for backward compatibility
 MC5ApiClient = MC5Client
 from .admin_client import (
@@ -399,9 +430,13 @@ __all__ = [
     "MC5Easy",
     "quick_connect",
     "check_my_daily_tasks",
-    "get_my_mc5_profile",
-    "find_mc5_player",
-    "get_global_id",
+    "get_server_status",
+    "get_online_players", 
+    "get_server_info",
+    "get_my_squad_id",
+    "get_my_squad_info",
+    "update_my_squad_info",
+    "get_my_squad_members",
     "generate_device_id",
     "create_federation_session",
     "locate_service",

{mc5_api_client-1.0.20 → mc5_api_client-1.0.21}/src/mc5_api_client/client.py

@@ -1652,6 +1652,186 @@ class MC5Client(SquadBattleMixin, FederationMixin, AlertsMixin, AccountMixin, Tr
                 "timestamp": time.time()
             }
     
+    # Automatic Squad Management (NEW!)
+    
+    def get_my_squad_id(self) -> Optional[str]:
+        """
+        Automatically fetch the user's squad ID from their profile.
+        
+        This method eliminates the need to manually specify squad ID for squad operations.
+        It fetches the user's profile and extracts the squad/group ID from their groups.
+        
+        Returns:
+            Squad ID if found, None otherwise
+        """
+        try:
+            # Get user profile which contains groups information
+            profile = self.get_profile()
+            
+            if not profile:
+                return None
+                
+            # Check if user has groups
+            groups = profile.get('groups', [])
+            if not groups:
+                return None
+            
+            # Extract squad ID from groups (usually the first group is the squad)
+            # Groups can be in different formats, handle multiple cases
+            for group in groups:
+                if isinstance(group, str):
+                    # Simple string ID
+                    return group
+                elif isinstance(group, dict):
+                    # Dictionary with ID field
+                    if 'id' in group:
+                        return group['id']
+                    elif '_id' in group:
+                        return group['_id']
+                    elif 'group_id' in group:
+                        return group['group_id']
+            
+            # If no group found in the expected format, try to extract from the groups string
+            if groups and isinstance(groups[0], str):
+                return groups[0]
+                
+            return None
+            
+        except Exception as e:
+            print(f"🔴 Error fetching squad ID: {e}")
+            return None
+    
+    def get_my_squad_info(self) -> Dict[str, Any]:
+        """
+        Get complete squad information using automatically fetched squad ID.
+        
+        Returns:
+            Dictionary with squad information or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "User is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Get squad information using the fetched ID
+            squad_info = self.get_clan_settings(squad_id)
+            
+            if squad_info:
+                squad_info['auto_fetched_squad_id'] = squad_id
+                squad_info['fetch_method'] = 'automatic'
+                return squad_info
+            else:
+                return {
+                    "error": "Failed to fetch squad details",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but could not fetch details",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to get squad information",
+                "timestamp": time.time()
+            }
+    
+    def update_my_squad_info(self, **kwargs) -> Dict[str, Any]:
+        """
+        Update squad information using automatically fetched squad ID.
+        
+        This is a convenience method that combines get_my_squad_id() and update_clan_settings().
+        Users don't need to specify squad ID - it's automatically fetched from their profile.
+        
+        Args:
+            **kwargs: Squad settings to update (same as update_clan_settings)
+                - name: Squad name
+                - description: Squad description  
+                - rating: Squad rating
+                - min_join_value: Minimum join value
+                - logo: Squad logo ID
+                - logo_clr_prim: Primary logo color
+                - logo_clr_sec: Secondary logo color
+        
+        Returns:
+            Dictionary with update result or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "Cannot update squad - user is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Update squad using the fetched ID
+            result = self.update_clan_settings(squad_id, **kwargs)
+            
+            if result:
+                result['auto_fetched_squad_id'] = squad_id
+                result['update_method'] = 'automatic'
+                return result
+            else:
+                return {
+                    "error": "Failed to update squad",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but update failed",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to update squad information",
+                "timestamp": time.time()
+            }
+    
+    def get_my_squad_members(self) -> Dict[str, Any]:
+        """
+        Get squad members using automatically fetched squad ID.
+        
+        Returns:
+            Dictionary with squad members or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "Cannot get squad members - user is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Get squad members using the fetched ID
+            members = self.get_clan_members(squad_id)
+            
+            if members:
+                return {
+                    "squad_id": squad_id,
+                    "members": members,
+                    "member_count": len(members) if isinstance(members, list) else 0,
+                    "fetch_method": "automatic",
+                    "timestamp": time.time()
+                }
+            else:
+                return {
+                    "error": "Failed to fetch squad members",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but could not fetch members",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to get squad members",
+                "timestamp": time.time()
+            }
+    
     # Events API
     
     def get_events(self, event_type: str = None, status: str = None) -> List[Dict[str, Any]]:

{mc5_api_client-1.0.20 → mc5_api_client-1.0.21/src/mc5_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc5_api_client
-Version: 1.0.20
+Version: 1.0.21
 Summary: A comprehensive Python library for interacting with the Modern Combat 5 API
 Home-page: https://pypi.org/project/mc5-api-client/
 Author: Chizoba