| {"repo": "teamsempo/SempoBlockchain", "pull_number": 130, "instance_id": "teamsempo__SempoBlockchain-130", "issue_numbers": "", "base_commit": "0b6ca1cac5009818a00ede1f973ddb8b8d8025a7", "patch": "diff --git a/app/server/__init__.py b/app/server/__init__.py\n--- a/app/server/__init__.py\n+++ b/app/server/__init__.py\n@@ -7,7 +7,8 @@\n from pusher import Pusher\n import boto3\n from twilio.rest import Client as TwilioClient\n-from raven.contrib.flask import Sentry\n+import sentry_sdk\n+from sentry_sdk.integrations.flask import FlaskIntegration\n import messagebird\n import africastalking\n from datetime import datetime\n@@ -85,13 +86,13 @@ def enable_form_raw_cache():\n return make_response(jsonify({'message': 'Payload too large'})), 413\n request.get_data(parse_form_data=False, cache=True)\n \n- if not config.IS_TEST:\n- sentry.init_app(app, dsn=app.config['SENTRY_SERVER_DSN'])\n # limiter.init_app(app)\n \n CORS(app, resources={r\"/api/*\": {\"origins\": \"*\"}})\n \n celery_app.conf.update(app.config)\n+ if not config.IS_TEST:\n+ sentry_sdk.init(app.config['SENTRY_SERVER_DSN'], integrations=[FlaskIntegration()], release=config.VERSION)\n \n print('celery joined on {} at {}'.format(\n app.config['REDIS_URL'], datetime.utcnow()))\n@@ -125,7 +126,7 @@ def after_request(response):\n try:\n task.delay()\n except Exception as e:\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n \n return response\n \n@@ -213,7 +214,6 @@ def encrypt_string(raw_string):\n })\n \n basic_auth = BasicAuth()\n-sentry = Sentry()\n \n # limiter = Limiter(key_func=get_remote_address, default_limits=[\"20000 per day\", \"2000 per hour\"])\n \ndiff --git a/app/server/api/auth_api.py b/app/server/api/auth_api.py\n--- a/app/server/api/auth_api.py\n+++ b/app/server/api/auth_api.py\n@@ -1,6 +1,7 @@\n from flask import Blueprint, request, make_response, jsonify, g, current_app\n from flask.views import MethodView\n-from server import db, sentry\n+import sentry_sdk\n+from server import db\n # from server import limiter\n from phonenumbers.phonenumberutil import NumberParseException\n from server.models.user import User\n@@ -436,9 +437,7 @@ def post(self):\n return make_response(jsonify(response_object)), 200\n \n except Exception as e:\n-\n- sentry.captureException()\n-\n+ sentry_sdk.capture_exception(e)\n raise e\n \n # response_object = {\ndiff --git a/app/server/api/credit_transfer_api.py b/app/server/api/credit_transfer_api.py\n--- a/app/server/api/credit_transfer_api.py\n+++ b/app/server/api/credit_transfer_api.py\n@@ -3,6 +3,7 @@\n from sqlalchemy import or_\n from functools import partial\n import json\n+import sentry_sdk\n from server import db\n from server.models.token import Token\n from server.models.utils import paginate_query\n@@ -28,7 +29,6 @@ class CreditTransferAPI(MethodView):\n \n @requires_auth(allowed_roles={'ADMIN': 'any'})\n def get(self, credit_transfer_id):\n-\n transfer_account_ids = request.args.get('transfer_account_ids')\n transfer_type = request.args.get('transfer_type', 'ALL')\n get_transfer_stats = request.args.get('get_stats', False)\ndiff --git a/app/server/api/kyc_application_api.py b/app/server/api/kyc_application_api.py\n--- a/app/server/api/kyc_application_api.py\n+++ b/app/server/api/kyc_application_api.py\n@@ -1,6 +1,7 @@\n+import sentry_sdk\n from flask import Blueprint, request, make_response, jsonify, g\n from flask.views import MethodView\n-from server import db, sentry\n+from server import db\n from server.models.bank_account import BankAccount\n from server.models.kyc_application import KycApplication\n from server.models.upload import UploadedResource\n@@ -45,7 +46,7 @@ def handle_kyc_documents(data=None,document_country=None,document_type=None,kyc_\n uploaded_document.kyc_application_id = kyc_details.id\n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n pass\n \n \ndiff --git a/app/server/models/ip_address.py b/app/server/models/ip_address.py\n--- a/app/server/models/ip_address.py\n+++ b/app/server/models/ip_address.py\n@@ -1,4 +1,5 @@\n-from server import db, sentry, celery_app, mt\n+import sentry_sdk\n+from server import db, celery_app, mt\n from sqlalchemy.ext.hybrid import hybrid_property\n from sqlalchemy.dialects.postgresql import INET\n \n@@ -37,5 +38,5 @@ def ip(self, ip):\n mt.set_ip_location(self.id, ip)\n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.captureException(e)\n pass\ndiff --git a/app/server/models/user.py b/app/server/models/user.py\n--- a/app/server/models/user.py\n+++ b/app/server/models/user.py\n@@ -12,8 +12,9 @@\n import jwt\n import random\n import string\n+import sentry_sdk\n \n-from server import db, sentry, celery_app, bt\n+from server import db, celery_app, bt\n from server.utils.misc import encrypt_string, decrypt_string\n from server.utils.access_control import AccessControl\n from server.utils.phone import proccess_phone_number\n@@ -250,8 +251,7 @@ def location(self, location):\n \n geolocate_task.delay()\n except Exception as e:\n- print(e)\n- sentry.captureException()\n+ sentry_sdk.captureException(e)\n pass\n \n @hybrid_property\ndiff --git a/app/server/models/ussd.py b/app/server/models/ussd.py\n--- a/app/server/models/ussd.py\n+++ b/app/server/models/ussd.py\n@@ -1,7 +1,8 @@\n from sqlalchemy.dialects.postgresql import JSON\n from sqlalchemy.orm.attributes import flag_modified\n+import sentry_sdk\n \n-from server import db, sentry\n+from server import db\n from server.models.utils import ModelBase\n \n \n@@ -28,7 +29,7 @@ class UssdMenu(ModelBase):\n def find_by_name(name: str) -> \"UssdMenu\":\n menus = UssdMenu.query.filter_by(name=name)\n if menus.count() == 0:\n- sentry.captureMessage(\"No USSD Menu with name {}\".format(name))\n+ sentry_sdk.capture_message(\"No USSD Menu with name {}\".format(name))\n # should handle case if no invalid_request menu?\n return UssdMenu.query.filter_by(name='exit_invalid_request').first()\n else:\ndiff --git a/app/server/utils/blockchain_transaction.py b/app/server/utils/blockchain_transaction.py\n--- a/app/server/utils/blockchain_transaction.py\n+++ b/app/server/utils/blockchain_transaction.py\n@@ -3,11 +3,11 @@\n from server.models.blockchain_transaction import BlockchainTransaction\n from server.models.blockchain_address import BlockchainAddress\n from server.exceptions import BlockchainError\n-from server import db, celery_app, sentry\n+from server import db, celery_app\n import datetime\n import random\n import time\n-\n+import sentry_sdk\n \n def add_full_transaction_details(details_dict, method='POST', force_transaction_creation=False):\n \n@@ -193,7 +193,7 @@ def get_usd_to_satoshi_rate():\n \n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n raise BlockchainError(\"Blockchain Error\")\n \n finally:\ndiff --git a/app/server/utils/credit_transfer.py b/app/server/utils/credit_transfer.py\n--- a/app/server/utils/credit_transfer.py\n+++ b/app/server/utils/credit_transfer.py\n@@ -4,6 +4,7 @@\n from flask import make_response, jsonify, current_app, g\n from sqlalchemy.sql import func\n import datetime, json\n+import sentry_sdk\n \n from server.exceptions import (\n NoTransferAccountError,\n@@ -14,7 +15,7 @@\n TransferAccountNotFoundError\n )\n \n-from server import db, sentry, red, bt\n+from server import db, red, bt\n from server.models.transfer_usage import TransferUsage\n from server.models.transfer_account import TransferAccount\n from server.models.blockchain_address import BlockchainAddress\n@@ -507,7 +508,7 @@ def make_payment_transfer(transfer_amount,\n \n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n \n return transfer\n \ndiff --git a/app/server/utils/ge_migrations/rds_migrate.py b/app/server/utils/ge_migrations/rds_migrate.py\n--- a/app/server/utils/ge_migrations/rds_migrate.py\n+++ b/app/server/utils/ge_migrations/rds_migrate.py\n@@ -3,8 +3,9 @@\n import time\n from sqlalchemy.exc import IntegrityError, InvalidRequestError\n import pprint\n+import sentry_sdk\n \n-from server import db, sentry\n+from server import db\n \n from server.models.user import User\n from server.models.organisation import Organisation\n@@ -350,7 +351,7 @@ def migrate_balances(self, ge_address_to_user: dict):\n \n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n pass\n \n def store_wei(self, address, balance):\ndiff --git a/app/server/utils/phone.py b/app/server/utils/phone.py\n--- a/app/server/utils/phone.py\n+++ b/app/server/utils/phone.py\n@@ -2,6 +2,7 @@\n import enum\n from flask import current_app\n import server\n+import sentry_sdk\n \n def proccess_phone_number(phone_number, region=None, ignore_region=False):\n \"\"\"\n@@ -93,7 +94,7 @@ def _send_at_message(self, to_phone, message):\n \n # If that fails, fallback to no sender ID\n if resp['SMSMessageData']['Message'] == 'InvalidSenderId':\n- server.sentry.captureMessage(\"InvalidSenderId {}\".format(current_app.config.get('AT_SENDER_ID', None)))\n+ sentry_sdk.capture_message(\"InvalidSenderId {}\".format(current_app.config.get('AT_SENDER_ID', None)))\n \n resp = self.africastalking_client.send(\n message,\ndiff --git a/app/server/utils/pusher.py b/app/server/utils/pusher.py\n--- a/app/server/utils/pusher.py\n+++ b/app/server/utils/pusher.py\n@@ -1,5 +1,7 @@\n+import sentry_sdk\n+\n from flask import current_app\n-from server import pusher_client, sentry\n+from server import pusher_client\n from server.schemas import credit_transfer_schema\n from server.utils import credit_transfer\n \n@@ -17,7 +19,7 @@ def push_admin_credit_transfer(transfer):\n )\n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n \n def push_user_transfer_confirmation(receive_user, transfer_random_key):\n try:\n@@ -28,4 +30,4 @@ def push_user_transfer_confirmation(receive_user, transfer_random_key):\n )\n except Exception as e:\n print(e)\n- sentry.captureException()\n\\ No newline at end of file\n+ sentry_sdk.capture_exception(e)\ndiff --git a/app/server/utils/user.py b/app/server/utils/user.py\n--- a/app/server/utils/user.py\n+++ b/app/server/utils/user.py\n@@ -7,6 +7,7 @@\n from bit import base58\n from flask import current_app, g\n from eth_utils import to_checksum_address\n+import sentry_sdk\n \n from server import db\n from server.models.device_info import DeviceInfo\n@@ -22,7 +23,7 @@\n from server.schemas import user_schema\n from server.constants import DEFAULT_ATTRIBUTES, KOBO_META_ATTRIBUTES\n from server.exceptions import PhoneVerificationError, TransferAccountNotFoundError\n-from server import celery_app, sentry, message_processor\n+from server import celery_app, message_processor\n from server.utils import credit_transfer as CreditTransferUtils\n from server.utils.phone import proccess_phone_number\n from server.utils.amazon_s3 import generate_new_filename, save_to_s3_from_url, LoadFileException\n@@ -42,7 +43,7 @@ def save_photo_and_check_for_duplicate(url, new_filename, image_id):\n rekognition_task.delay()\n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n pass\n \n \n@@ -617,7 +618,7 @@ def proccess_create_or_modify_user_request(\n send_onboarding_sms_messages(user)\n except Exception as e:\n print(e)\n- sentry.captureException()\n+ sentry_sdk.capture_exception(e)\n pass\n \n response_object = {\ndiff --git a/config.py b/config.py\n--- a/config.py\n+++ b/config.py\n@@ -5,6 +5,8 @@\n \n from web3 import Web3\n \n+VERSION = '1.0.0' # Remember to bump this in every PR\n+\n CONFIG_DIR = os.path.abspath(os.path.dirname(__file__))\n \n # ENV_DEPLOYMENT_NAME: dev, 'acmecorp-prod' etc\ndiff --git a/whatsApp/whatsapp.py b/whatsApp/whatsapp.py\n--- a/whatsApp/whatsapp.py\n+++ b/whatsApp/whatsapp.py\n@@ -1,7 +1,7 @@\n from time import sleep\n from datetime import datetime\n \n-from raven import Client\n+import sentry_sdk\n \n import requests\n from requests.auth import HTTPBasicAuth\n@@ -335,8 +335,8 @@ def parse_queue_task(task):\n if __name__ =='__main__':\n \n print('whatsapp starting: ' + str(datetime.utcnow()))\n+ sentry_sdk.init(config.SENTRY_SERVER_DSN, release=config.WEB_VERSION)\n \n- client = Client(config.SENTRY_SERVER_DSN)\n \n try:\n \ndiff --git a/worker/__init__.py b/worker/__init__.py\n--- a/worker/__init__.py\n+++ b/worker/__init__.py\n@@ -1,10 +1,10 @@\n+import sentry_sdk\n from celery import Celery, beat\n-from raven import Client\n import redis\n \n import config\n \n-client = Client(config.SENTRY_SERVER_DSN)\n+sentry_sdk.init(config.SENTRY_SERVER_DSN, release=config.VERSION)\n \n celery_app = Celery('tasks',\n broker=config.REDIS_URL,\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2020-01-22T18:42:55Z"} | |