aimodelshare 0.1.59__py3-none-any.whl → 0.1.60__py3-none-any.whl

aimodelshare/aws.py

@@ -10,7 +10,7 @@ def set_credentials(credential_file=None, type="submit_model", apiurl="apiurl",
   import os
   import getpass
   from aimodelshare.aws import get_aws_token
-  from aimodelshare.modeluser import get_jwt_token, create_user_getkeyandpassword
+  from aimodelshare.modeluser import get_jwt_token, setup_bucket_only
   if all([credential_file==None, type=="submit_model"]):
     set_credentials_public(type="submit_model", apiurl=apiurl)
     os.environ["AWS_TOKEN"]=get_aws_token()
@@ -131,7 +131,7 @@ def set_credentials(credential_file=None, type="submit_model", apiurl="apiurl",
       # Set Environment Variables for deploy models
       if type == "deploy_model":
         get_jwt_token(os.environ.get("username"), os.environ.get("password"))
-        create_user_getkeyandpassword()  
+        setup_bucket_only()  # Use new function that doesn't create IAM users  
         
       if not flag: 
         print("Error: apiurl or type not found in"+str(credential_file)+". Please correct entries and resubmit.")
@@ -147,7 +147,7 @@ def set_credentials_public(credential_file=None, type="submit_model", apiurl="ap
   import os
   import getpass
   from aimodelshare.aws import get_aws_token
-  from aimodelshare.modeluser import get_jwt_token, create_user_getkeyandpassword
+  from aimodelshare.modeluser import get_jwt_token, setup_bucket_only
 
   ##TODO: Require that "type" is provided, to ensure correct env vars get loaded
   flag = False
@@ -211,7 +211,7 @@ def set_credentials_public_aimscloud(credential_file=None, type="deploy_model",
   import os
   import getpass
   from aimodelshare.aws import get_aws_token
-  from aimodelshare.modeluser import get_jwt_token, create_user_getkeyandpassword
+  from aimodelshare.modeluser import get_jwt_token, setup_bucket_only
 
   ##TODO: Require that "type" is provided, to ensure correct env vars get loaded
   flag = False

aimodelshare/generatemodelapi.py

@@ -23,7 +23,7 @@ from aimodelshare.aws import get_s3_iam_client, run_function_on_lambda, get_toke
 from aimodelshare.bucketpolicy import _custom_upload_policy
 from aimodelshare.exceptions import AuthorizationError, AWSAccessError, AWSUploadError
 from aimodelshare.api import get_api_json
-from aimodelshare.modeluser import create_user_getkeyandpassword, decode_token_unverified
+from aimodelshare.modeluser import decode_token_unverified
 from aimodelshare.preprocessormodules import upload_preprocessor
 from aimodelshare.model import _get_predictionmodel_key, _extract_model_metadata
 from aimodelshare.data_sharing.share_data import share_data_codebuild

aimodelshare/model.py

@@ -918,7 +918,7 @@ def submit_model(
 
     import os
     from aimodelshare.aws import get_aws_token
-    from aimodelshare.modeluser import get_jwt_token, create_user_getkeyandpassword
+    from aimodelshare.modeluser import get_jwt_token
     import ast
 
     # Confirm that creds are loaded, raise error if not

aimodelshare/modeluser.py

@@ -55,8 +55,73 @@ def get_jwt_token(username, password):
 
     return 
 
-def create_user_getkeyandpassword():
+def setup_bucket_only():
+    """
+    Set up the S3 bucket for aimodelshare without creating new IAM users.
+    
+    Uses the provided AWS credentials to create or access the bucket.
+    This avoids creating a new IAM user every time credentials are set.
+    """
+    from aimodelshare.aws import get_s3_iam_client
 
+    s3, iam, region = get_s3_iam_client(os.environ.get("AWS_ACCESS_KEY_ID_AIMS"), 
+                                        os.environ.get("AWS_SECRET_ACCESS_KEY_AIMS"), 
+                                        os.environ.get("AWS_REGION_AIMS"))
+    
+    user_session = boto3.session.Session(aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID_AIMS"),
+                                         aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY_AIMS"), 
+                                         region_name= os.environ.get("AWS_REGION_AIMS"))    
+    
+    account_number = user_session.client(
+        'sts').get_caller_identity().get('Account')
+
+    # Remove special characters from username
+    username_clean = re.sub('[^A-Za-z0-9-]+', '', os.environ.get("username"))
+    bucket_name = 'aimodelshare' + username_clean.lower() + str(account_number) + region.replace('-', '')
+    
+    region = os.environ.get("AWS_REGION_AIMS")
+    s3_client = s3['client']
+
+    # Create bucket if it doesn't exist
+    try:
+        response = s3_client.head_bucket(Bucket=bucket_name)
+    except:
+        if region == "us-east-1":
+            response = s3_client.create_bucket(
+                ACL="private",
+                Bucket=bucket_name
+            )
+        else:
+            location = {'LocationConstraint': region}
+            response = s3_client.create_bucket(
+                ACL="private",
+                Bucket=bucket_name,
+                CreateBucketConfiguration=location
+            )
+
+    # Set the bucket name in environment for use by other functions
+    os.environ["BUCKET_NAME"] = bucket_name
+    
+    return
+
+
+def create_user_getkeyandpassword():
+    """
+    DEPRECATED: This function creates a new IAM user every time it's called.
+    
+    Use setup_bucket_only() instead, which uses the provided AWS credentials
+    without creating new IAM users and policies.
+    
+    This function is kept for backward compatibility but should not be used.
+    """
+    import warnings
+    warnings.warn(
+        "create_user_getkeyandpassword() is deprecated and creates unnecessary IAM users. "
+        "Use setup_bucket_only() instead.",
+        DeprecationWarning,
+        stacklevel=2
+    )
+    
     from aimodelshare.bucketpolicy import _custom_s3_policy
     from aimodelshare.tools import form_timestamp
     from aimodelshare.aws import get_s3_iam_client
@@ -145,5 +210,6 @@ def create_user_getkeyandpassword():
 __all__ = [
     get_jwt_token,
     create_user_getkeyandpassword,
+    setup_bucket_only,
     decode_token_unverified,
 ]

aimodelshare/moral_compass/README.md

@@ -91,6 +91,47 @@ client = MoralcompassApiClient(auth_token="your.jwt.token")
 client = MoralcompassApiClient()  # Uses JWT_AUTHORIZATION_TOKEN or AWS_TOKEN
 ```
 
+### Automatic Token Acquisition
+
+If no JWT token is found in environment variables, the client will attempt to auto-generate one using username and password credentials. This provides seamless integration when users have already configured credentials via `configure_credentials()`:
+
+```bash
+# Set credentials for automatic JWT generation
+export AIMODELSHARE_USERNAME="your-username"
+export AIMODELSHARE_PASSWORD="your-password"
+
+# Alternative variable names also supported
+export username="your-username"
+export password="your-password"
+```
+
+```python
+from aimodelshare.moral_compass import MoralcompassApiClient
+from aimodelshare.modeluser import get_jwt_token
+import os
+
+# Method 1: Let the client auto-generate (recommended)
+# Client will automatically use AIMODELSHARE_USERNAME/AIMODELSHARE_PASSWORD
+client = MoralcompassApiClient()
+
+# Method 2: Explicitly generate and set JWT token
+if not os.getenv('JWT_AUTHORIZATION_TOKEN'):
+    username = os.getenv('AIMODELSHARE_USERNAME')
+    password = os.getenv('AIMODELSHARE_PASSWORD')
+    if username and password:
+        get_jwt_token(username, password)  # Sets JWT_AUTHORIZATION_TOKEN
+        # Now JWT_AUTHORIZATION_TOKEN is available for subsequent API calls
+
+client = MoralcompassApiClient()
+```
+
+The auto-generation process:
+1. Checks for existing JWT_AUTHORIZATION_TOKEN (skips if found)
+2. Looks for AIMODELSHARE_USERNAME/AIMODELSHARE_PASSWORD or username/password
+3. Calls `get_jwt_token()` to generate and set JWT_AUTHORIZATION_TOKEN
+4. Uses the generated token for API authentication
+5. Logs success/failure for debugging
+
 ### Table Ownership
 
 When authentication is enabled, tables have ownership metadata:

aimodelshare/moral_compass/_version.py

@@ -1,3 +1,3 @@
 """Version information for aimodelshare.moral_compass"""
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"

aimodelshare/moral_compass/api_client.py

@@ -96,6 +96,11 @@ class MoralcompassApiClient:
         self.api_base_url = (api_base_url or get_api_base_url()).rstrip("/")
         self.timeout = timeout
         self.auth_token = auth_token or self._get_auth_token_from_env()
+        
+        # Auto-generate JWT if no token found but credentials available
+        if not self.auth_token:
+            self._auto_generate_jwt_if_possible()
+        
         self.session = self._create_session()
         logger.info(f"MoralcompassApiClient initialized with base URL: {self.api_base_url}")
     
@@ -115,6 +120,42 @@ class MoralcompassApiClient:
             # Fallback to direct environment variable access if auth module not available
             return os.getenv('JWT_AUTHORIZATION_TOKEN') or os.getenv('AWS_TOKEN')
     
+    def _auto_generate_jwt_if_possible(self) -> None:
+        """
+        Attempt to auto-generate a JWT token if credentials are available.
+        
+        Checks for username/password environment variables and uses them to generate
+        a JWT token via aimodelshare.modeluser.get_jwt_token if possible.
+        
+        Sets self.auth_token and exports JWT_AUTHORIZATION_TOKEN if successful.
+        """
+        # Check for username/password environment variables
+        username = os.getenv('AIMODELSHARE_USERNAME') or os.getenv('username')
+        password = os.getenv('AIMODELSHARE_PASSWORD') or os.getenv('password')
+        
+        if not (username and password):
+            logger.debug("Auto JWT generation skipped: No username/password credentials found in environment")
+            return
+        
+        try:
+            from aimodelshare.modeluser import get_jwt_token
+            
+            # Generate JWT token
+            logger.debug(f"Attempting to auto-generate JWT token for user: {username[:3]}***")
+            get_jwt_token(username, password)
+            
+            # get_jwt_token sets JWT_AUTHORIZATION_TOKEN in environment, retrieve it
+            token = os.getenv('JWT_AUTHORIZATION_TOKEN')
+            if token:
+                self.auth_token = token
+                logger.info(f"Auto-generated JWT token for moral_compass client. Token: {token[:10]}...")
+            else:
+                logger.debug("JWT token generation completed but JWT_AUTHORIZATION_TOKEN not found in environment")
+                
+        except Exception as e:
+            logger.debug(f"Auto JWT generation failed: {e}")
+            # Continue without token - let the actual API calls handle authorization errors
+    
     def _create_session(self) -> requests.Session:
         """
         Create a requests session with retry configuration.
@@ -172,7 +213,14 @@ class MoralcompassApiClient:
             )
             
             # Handle specific error codes
-            if response.status_code == 404:
+            if response.status_code == 401:
+                auth_msg = "Authentication failed (401 Unauthorized)"
+                if not self.auth_token:
+                    auth_msg += ". No authentication token provided. Set JWT_AUTHORIZATION_TOKEN environment variable or set AIMODELSHARE_USERNAME/AIMODELSHARE_PASSWORD for automatic JWT generation."
+                else:
+                    auth_msg += f". Token present but invalid or expired. Token: {self.auth_token[:10]}..."
+                raise ApiClientError(f"{auth_msg} | URL: {response.url} | Response: {response.text}")
+            elif response.status_code == 404:
                 raise NotFoundError(f"Resource not found: {path} | body={response.text}")
             elif 500 <= response.status_code < 600:
                 raise ServerError(f"Server error {response.status_code}: {response.text}")

{aimodelshare-0.1.59.dist-info → aimodelshare-0.1.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.59
+Version: 0.1.60
 Summary: Deploy locally saved machine learning models to a live REST API and integrated dashboard.
 Author-email: Michael Parrott <mikedparrott@modelshare.ai>
 License: 

{aimodelshare-0.1.59.dist-info → aimodelshare-0.1.60.dist-info}/RECORD

@@ -3,7 +3,7 @@ aimodelshare/__init__.py,sha256=csP3KFDIvloTtRqqGh7Jg1eo0Q6-V63VQbgYR2zzWZs,3228
 aimodelshare/aimsonnx.py,sha256=NCjRd535kTfJ6zSEa2o9QpC-TqHPIiDNuS0yHcAQzx8,77178
 aimodelshare/api.py,sha256=3AuTS88M-6zXye3eCjjaAnHpdvLjHHdYMyPZJm9O0Cc,35107
 aimodelshare/auth.py,sha256=7FatqYMDF3x2u9GRuNm-2lvMMLKO1AHtWRxzu36ZVqE,4774
-aimodelshare/aws.py,sha256=jn99R9-N77Qac-_eYm-LaCQUPd-RnE7oVULm9rh-3RY,15232
+aimodelshare/aws.py,sha256=GSFw1Flc-hIyAk3a_0CtlKTOlhUBSeMF0tcRIweOHbI,15234
 aimodelshare/aws_client.py,sha256=Ce19iwf69BwpuyyJlVN8z1da3c5jf93svsTgx1OWhaA,6784
 aimodelshare/base_image.py,sha256=itaQmX_q5GmgQrL3VNCBJpDGhl4PGA-nLTCbuyNDCCc,4825
 aimodelshare/bucketpolicy.py,sha256=KLyl-BLBiFdTYzCK7tJV8NBJHBKWRlF3_msSTGwgaQQ,3055
@@ -12,10 +12,10 @@ aimodelshare/containerization.py,sha256=Sa9GWxmz1qoDZ3lUQjFa1ctQUSs666I7-Yf0YU3W
 aimodelshare/custom_eval_metrics.py,sha256=NghFslmLDyvIkZ27yZhFIItLbzHnNb0bJ2ZO7cqkucw,3170
 aimodelshare/deploy_custom_lambda.py,sha256=HFxxIYI2JrZwPrjqKgFkj6KaCeRBOn6tf9e2fqBUl2U,11045
 aimodelshare/exceptions.py,sha256=gfrwQ7LHNyjgUNHM4X_LNZ7JhKwZv9qWN3DhBaB-f-k,318
-aimodelshare/generatemodelapi.py,sha256=fxQ90Fpcz6jCG0vFJ1GweIYjxFT_u92C3qe5ZW-D8A8,59732
+aimodelshare/generatemodelapi.py,sha256=lfJQs93gu_WYrUPmbXrb0Whe3cABLtvA5cXpqq2gs8A,59701
 aimodelshare/leaderboard.py,sha256=xtKJcNCsZjy2IoK1fUTAFyM_I-eLCMS1WJRfwgsT5AA,5216
-aimodelshare/model.py,sha256=HjiETn_IppZ_6x63QSFNViBSDJN_hU44UsSQRzGE4Ow,62342
-aimodelshare/modeluser.py,sha256=jyZVRs-31URmKJJMvbM9NBXykiOEsznnYK25LzDo-GU,5006
+aimodelshare/model.py,sha256=_W7479wJxzsguDBKhmaNZyAtuSHiNI_fF6EZAOtbL8w,62311
+aimodelshare/modeluser.py,sha256=uZJjwaT7zHBEcfttl6JYxvDdabKl36YdgvSjRa-gF8E,7512
 aimodelshare/playground.py,sha256=jOMls-mv_A8W8AOM8ZCpSci63UauciMxPH5VwHclLN0,89273
 aimodelshare/postprocessormodules.py,sha256=L87fM2mywlInOrgaMETi-7zdHBGbIMRcrXKttQthyQ4,4992
 aimodelshare/preprocessormodules.py,sha256=48HIur55nytD0FdhW1u1wWSAiaIW4uof0cJP1Yoq0T4,13183
@@ -112,10 +112,10 @@ aimodelshare/main/eval_lambda.txt,sha256=r3GqJodO5QG6jeK4xWUzLrXM9K7XLXeUJouhz6e
 aimodelshare/main/eval_regression.txt,sha256=iQeE9mbOkg-BDF9TnoQmglo86jBJitJQCvaf1eELzrs,3111
 aimodelshare/main/lambda_function.txt,sha256=-XkuD2YUOWNryNT7rBPjlts588UAeE949TUqeVGCRlQ,150
 aimodelshare/main/nst.txt,sha256=8kTsR18kDEcaQbv6091XDq1tRiqqFxdqfCteslR_udk,4941
-aimodelshare/moral_compass/README.md,sha256=J3D1W1x7KVHLJn5D_Rwhqeaa6CVsywBpU4JmKEtHuAY,10303
+aimodelshare/moral_compass/README.md,sha256=2wTCI0s43Tm9WXRIJjtj6h-FFHsdHhzx-Aimy_UupBY,11888
 aimodelshare/moral_compass/__init__.py,sha256=CRUuQLeccumeFDl4RZDxFNFZlUw73W0wA5n7adYhgew,1708
-aimodelshare/moral_compass/_version.py,sha256=nGjn9uzc3g2iY_fCxtBI1a6xkZ8xPxgk7PJTt5zKElE,80
-aimodelshare/moral_compass/api_client.py,sha256=Z3kXjH7Ryi6QrXbe8I_IL2KqzgWt4EiGIu_YKwa3kFg,19893
+aimodelshare/moral_compass/_version.py,sha256=GhviEK9nfN1o9XunS8V4jXqgMmcB-Vpp2VCYWplLzqE,80
+aimodelshare/moral_compass/api_client.py,sha256=3WVWBuuEJ9x0R6raUu6TKZPv2swgVxCDwKXKg8Esq24,22393
 aimodelshare/moral_compass/challenge.py,sha256=p--uqP30tPQnVcOPs4LEJFaXlqTRL9Zb7SVkEvggl2U,12971
 aimodelshare/moral_compass/config.py,sha256=8HsoTreAAdXaWOdg30B1IJXwIGMBNEz7hqgNZpAFUhI,6119
 aimodelshare/placeholders/model.onnx,sha256=i04ndsRw5VBTOpIH-LHqTjAPHcJZNzyWSSz1zSmukBw,3464
@@ -149,8 +149,8 @@ aimodelshare/sam/spark-class.txt,sha256=chyJBxDzCzlUKXzVQYTzuJ2PXCTwg8_gd1yfnI-x
 aimodelshare/sam/template.txt,sha256=JKSvEOZNaaLalHSx7r9psJg_6LLCb0XLAYi1-jYPu3M,1195
 aimodelshare/utils/__init__.py,sha256=6ieChHjYDsn_gSyeOiLeWW5hWkUfZUucEzSFyBN7xck,1973
 aimodelshare/utils/optional_deps.py,sha256=t0ZcPlaAKEQqBpD-GDbFGg9a-qp2fsqonTVM0dLWNV4,1257
-aimodelshare-0.1.59.dist-info/licenses/LICENSE,sha256=XdPthYienQee9LH1duXNGtsj6GUTXPvtf_1MpC8WhL4,115
-aimodelshare-0.1.59.dist-info/METADATA,sha256=mckigVSwxqMq0P-6QOtcATqvCQ1IU8CztsPLkwx8va8,8731
-aimodelshare-0.1.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aimodelshare-0.1.59.dist-info/top_level.txt,sha256=d-0DAtZDZsvfauQzUjXHJRKVYfaqMWZXz3WGmmIzE5w,13
-aimodelshare-0.1.59.dist-info/RECORD,,
+aimodelshare-0.1.60.dist-info/licenses/LICENSE,sha256=XdPthYienQee9LH1duXNGtsj6GUTXPvtf_1MpC8WhL4,115
+aimodelshare-0.1.60.dist-info/METADATA,sha256=63ASeulZNPn9b-bpyy0uwLiEHp92d9ToXOzIAr8j3Uo,8731
+aimodelshare-0.1.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aimodelshare-0.1.60.dist-info/top_level.txt,sha256=d-0DAtZDZsvfauQzUjXHJRKVYfaqMWZXz3WGmmIzE5w,13
+aimodelshare-0.1.60.dist-info/RECORD,,