From 5072212a158c77c73673bdbfa6f6e350c637fa1e Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Wed, 10 May 2023 10:57:10 +0500 Subject: [PATCH 01/10] initial commit --- .gitignore | 3 +++ ipinfodb/__init__.py | 1 + ipinfodb/client.py | 61 +++++++++++++++++++++++++++++++++++++++++++ tests/test_all.py | 27 +++++++++++++++++++ tests/tests_db.mmdb | Bin 0 -> 1354 bytes 5 files changed, 92 insertions(+) create mode 100644 .gitignore create mode 100644 ipinfodb/__init__.py create mode 100644 ipinfodb/client.py create mode 100644 tests/test_all.py create mode 100644 tests/tests_db.mmdb diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ce9d7e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +files/ +__pycache__/ +.pytest_cache diff --git a/ipinfodb/__init__.py b/ipinfodb/__init__.py new file mode 100644 index 0000000..3ff722b --- /dev/null +++ b/ipinfodb/__init__.py @@ -0,0 +1 @@ +from .client import Client diff --git a/ipinfodb/client.py b/ipinfodb/client.py new file mode 100644 index 0000000..9c4740b --- /dev/null +++ b/ipinfodb/client.py @@ -0,0 +1,61 @@ +import maxminddb +import urllib.request +import os + +DB_DOWNLOAD_URL = "https://ipinfo.io/data/free/country_asn.mmdb?token=" +DEFAULT_DB_PATH = "./files/country_asn.mmdb" + +class Client: + + def __init__(self, access_token=None, path=None, replace=False): + self.access_token = access_token + self.path = path + self.replace = replace + + if self.access_token is None and self.path is None: + raise SyntaxError("Token or Path is required") + + if self.path is None: + self.path = DEFAULT_DB_PATH + + # Check if file already exists skip the download. + if os.path.exists(self.path) and not self.replace: + print("File already exists. Skipping download.") + else: + if self.access_token is None: + raise SyntaxError("Token is required to download the file") + + # Create directory if doesn't exist and download file. + directory = os.path.dirname(self.path) + if directory and not os.path.exists(directory): + os.makedirs(directory) + print("Downloading mmdb file.") + urllib.request.urlretrieve(DB_DOWNLOAD_URL+self.access_token, self.path) + + # Read the mmdb file. + self.db = maxminddb.open_database(self.path) + + def getDetails(self, ip): + return self.db.get(ip) + + def getCountry(self, ip): + return self.db.get(ip)['country'] + + def getCountryName(self, ip): + return self.db.get(ip)['country_name'] + + def getContinent(self, ip): + return self.db.get(ip)['continent'] + + def getContinentName(self, ip): + return self.db.get(ip)['continent_name'] + + def getASN(self, ip): + return self.db.get(ip)['asn'] + + def getASNName(self, ip): + return self.db.get(ip)['as_name'] + + def getASNDomain(self, ip): + return self.db.get(ip)['as_domain'] + \ No newline at end of file diff --git a/tests/test_all.py b/tests/test_all.py new file mode 100644 index 0000000..d25e21e --- /dev/null +++ b/tests/test_all.py @@ -0,0 +1,27 @@ +import pytest +import ipinfodb + + +client = ipinfodb.Client(path='./tests/tests_db.mmdb') + + +def test_get_country(): + assert(client.getCountry("8.8.8.8"), "US") + +def test_get_country_name(): + assert(client.getCountryName('8.8.8.8'),"United States") + +def test_get_continent(): + assert(client.getContinent('8.8.8.8'),"NA") + +def test_get_continent_name(): + assert(client.getContinentName('8.8.8.8'),"North America") + +def test_get_asn(): + assert(client.getASN('8.8.8.8'),"AS15169") + +def test_get_asn_name(): + assert(client.getASNName('8.8.8.8'),"Google LLC") + +def test_get_asn_domain(): + assert(client.getASNDomain('8.8.8.8'),"google.com") diff --git a/tests/tests_db.mmdb b/tests/tests_db.mmdb new file mode 100644 index 0000000000000000000000000000000000000000..6092af5cf254e895644514aafa40a068c8527c6a GIT binary patch literal 1354 zcmZwGX>!vr6u|Mcl(O&p9`?2AMoP<`1PEE7q+u&y6kAEv#!|4AHsJ&ugMQ`|9Dqac z4L)%Nob*5K41+aqetMFg=Gilj#bN`oSgaGpAa24T+>FDx1-Ifh+>SeNC+@=CxCi&* zKHQH7@E{(-!*~Rb;xRmqC-5Ym!qa#L<9HU&;d#7(7x5Ba#w&Ogui6s9qQkMJ=*!7M(-9OkirMJ!<%pW$ Date: Wed, 10 May 2023 12:42:11 +0500 Subject: [PATCH 02/10] added newline --- ipinfodb/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ipinfodb/client.py b/ipinfodb/client.py index 9c4740b..f2820b6 100644 --- a/ipinfodb/client.py +++ b/ipinfodb/client.py @@ -58,4 +58,3 @@ def getASNName(self, ip): def getASNDomain(self, ip): return self.db.get(ip)['as_domain'] - \ No newline at end of file From 7e31187f17f036924469a6dcbcb3147775a8e2f3 Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Wed, 10 May 2023 12:56:33 +0500 Subject: [PATCH 03/10] added requirements.txt --- .gitignore | 1 + requirements.txt | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 4ce9d7e..e48cb37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ files/ __pycache__/ .pytest_cache +env/ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e3b18ae --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +exceptiongroup==1.1.1 +iniconfig==2.0.0 +maxminddb==2.3.0 +packaging==23.1 +pluggy==1.0.0 +pytest==7.3.1 +tomli==2.0.1 From 6cf15772ac84dc53b6cf0b2bafb5503f919bde9c Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Wed, 10 May 2023 13:06:16 +0500 Subject: [PATCH 04/10] added license --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..cd482d8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. From c0db1d32fa0c9cb856fb26c718211cb68ba9b2eb Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Wed, 10 May 2023 13:16:37 +0500 Subject: [PATCH 05/10] added setup.py --- ipinfodb/version.py | 1 + setup.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 ipinfodb/version.py create mode 100644 setup.py diff --git a/ipinfodb/version.py b/ipinfodb/version.py new file mode 100644 index 0000000..4b53e9b --- /dev/null +++ b/ipinfodb/version.py @@ -0,0 +1 @@ +SDK_VERSION = "0.0.1" diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..f5f07b1 --- /dev/null +++ b/setup.py @@ -0,0 +1,26 @@ +from setuptools import setup + +from ipinfodb.version import SDK_VERSION + +long_description = """ +The official Python MMDB library for IPinfo. + +IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. +We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. +You can visit our developer docs at https://ipinfo.io/developers. +""" + +setup( + name="ipinfodb", + version=SDK_VERSION, + description="Official Python MMDB library for IPInfo", + long_description=long_description, + url="https://github.com/ipinfo/python-db", + author="IPinfo", + author_email="support@ipinfo.io", + license="Apache License 2.0", + packages=["ipinfodb"], + install_requires=["maxminddb"], + include_package_data=True, + zip_safe=False, +) From c38363803c3991855dec230f6f682da5a9fc77ff Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Wed, 10 May 2023 13:38:12 +0500 Subject: [PATCH 06/10] added README --- .gitignore | 2 ++ README.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- setup.py | 4 ++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e48cb37..446605a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ files/ __pycache__/ .pytest_cache env/ +build/ +ipinfodb.egg-info/ diff --git a/README.md b/README.md index 52316f0..116cb09 100644 --- a/README.md +++ b/README.md @@ -1 +1,51 @@ -IPinfo python-db +# [IPinfo](https://ipinfo.io/) IPinfo Python Free Database Library + +This is the official Python library for the IPinfo.io free database, allowing you to lookup country and ASN details for an IP. + +## Getting Started + +You'll need an IPinfo API access token (which you can get by singing up for a free account at [https://ipinfo.io/signup](https://ipinfo.io/signup)) if you want to download the free database or you can provide the path to the mmdb file. + +### Installation + +This package works with Python 3.5 or greater. However, we only officially +support non-EOL Python versions. + +```bash +pip install ipinfodb +``` + +### Quick Start + +```python +>>> import ipinfodb +>>> access_token = '123456789abc' +>>> client = ipinfodb.Client(access_token) +>>> ip_address = '216.239.36.21' +>>> country = client.getCountry(ip_address) +>>> country +'US' +``` +Client will download the free `country_asn` mmdb database if it doesn't exist or the path to the mmdb file is not provided. If the database exists in default path it'll skip the download but can be forced to replace the old file by providing `replace=True` while initializing client object. +```python +>>> client = ipinfodb.Client(access_token, replace=True) +``` +### Available Methods + +- getCountry(ip) +- getCountryName(ip) +- getContinent(ip) +- getContinentName(ip) +- getASN(ip) +- getASNName(ip) +- getASNDomain(ip) + +## Other Libraries + +There are official [IPinfo client libraries](https://ipinfo.io/developers/libraries) available for many languages including PHP, Go, Java, Ruby, and many popular frameworks such as Django, Rails and Laravel. There are also many third party libraries and integrations available for our API. + +## About IPinfo + +Founded in 2013, IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier, VPN detection, hosted domains, and IP type data sets. Our API handles over 40 billion requests a month for 100,000 businesses and developers. + +[![image](https://avatars3.githubusercontent.com/u/15721521?s=128&u=7bb7dde5c4991335fb234e68a30971944abc6bf3&v=4)](https://ipinfo.io/) diff --git a/setup.py b/setup.py index f5f07b1..0bab94a 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from ipinfodb.version import SDK_VERSION long_description = """ -The official Python MMDB library for IPinfo. +The official Python free database library for IPinfo. IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. @@ -13,7 +13,7 @@ setup( name="ipinfodb", version=SDK_VERSION, - description="Official Python MMDB library for IPInfo", + description="Official Python free database library for IPInfo", long_description=long_description, url="https://github.com/ipinfo/python-db", author="IPinfo", From 5adcfb84df5414323785fa94c937749c899bd7ac Mon Sep 17 00:00:00 2001 From: Uman Shahzad Date: Thu, 11 May 2023 18:31:56 +0500 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 116cb09..f0436b5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [IPinfo](https://ipinfo.io/) IPinfo Python Free Database Library -This is the official Python library for the IPinfo.io free database, allowing you to lookup country and ASN details for an IP. +This is the official Python library for IPinfo.io's free [IP to Country ASN Database](https://ipinfo.io/products/free-ip-database), allowing you to lookup country and ASN details for IP addresses. ## Getting Started From 48689e7a6eac5080a0ca4406e9a3aa12d92e70e7 Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Fri, 12 May 2023 10:30:35 +0500 Subject: [PATCH 08/10] refactored and error handling --- README.md | 9 +++++++-- ipinfodb/client.py | 34 ++++++++++++++++++++++------------ requirements.txt | 1 + setup.py | 2 +- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index f0436b5..c08bd7f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ This is the official Python library for IPinfo.io's free [IP to Country ASN Data ## Getting Started -You'll need an IPinfo API access token (which you can get by singing up for a free account at [https://ipinfo.io/signup](https://ipinfo.io/signup)) if you want to download the free database or you can provide the path to the mmdb file. +You'll need an IPinfo API access token (which you can get by signing up for a free account at [https://ipinfo.io/signup](https://ipinfo.io/signup)) if you want to download the free database. + +You can also provide the path to the database file explicitly. ### Installation @@ -26,10 +28,13 @@ pip install ipinfodb >>> country 'US' ``` -Client will download the free `country_asn` mmdb database if it doesn't exist or the path to the mmdb file is not provided. If the database exists in default path it'll skip the download but can be forced to replace the old file by providing `replace=True` while initializing client object. +The `Client` will download the free `country_asn` database if it doesn't exist or if the path to the database file is not provided. + +If the database exists in the default path, the download will be skipped, but can still be forced to replace the old file by providing `replace=True` while initializing the `Client` object. ```python >>> client = ipinfodb.Client(access_token, replace=True) ``` + ### Available Methods - getCountry(ip) diff --git a/ipinfodb/client.py b/ipinfodb/client.py index f2820b6..48318a4 100644 --- a/ipinfodb/client.py +++ b/ipinfodb/client.py @@ -1,9 +1,11 @@ import maxminddb import urllib.request import os +import appdirs DB_DOWNLOAD_URL = "https://ipinfo.io/data/free/country_asn.mmdb?token=" -DEFAULT_DB_PATH = "./files/country_asn.mmdb" +DEFAULT_APP_PATH = appdirs.user_data_dir(appname='ipinfodb', appauthor='ipinfo') +DEFAULT_DB_PATH = os.path.join(DEFAULT_APP_PATH, 'files/country_asn.mmdb') class Client: @@ -18,9 +20,9 @@ def __init__(self, access_token=None, path=None, replace=False): if self.path is None: self.path = DEFAULT_DB_PATH - # Check if file already exists skip the download. + # Check if file already exists to skip the download. if os.path.exists(self.path) and not self.replace: - print("File already exists. Skipping download.") + pass else: if self.access_token is None: raise SyntaxError("Token is required to download the file") @@ -29,32 +31,40 @@ def __init__(self, access_token=None, path=None, replace=False): directory = os.path.dirname(self.path) if directory and not os.path.exists(directory): os.makedirs(directory) - print("Downloading mmdb file.") urllib.request.urlretrieve(DB_DOWNLOAD_URL+self.access_token, self.path) # Read the mmdb file. self.db = maxminddb.open_database(self.path) def getDetails(self, ip): - return self.db.get(ip) + return self.db.get(ip) or _no_data_error(ip) def getCountry(self, ip): - return self.db.get(ip)['country'] + return self._get_data_field(ip, 'country') def getCountryName(self, ip): - return self.db.get(ip)['country_name'] + return self._get_data_field(ip, 'country_name') def getContinent(self, ip): - return self.db.get(ip)['continent'] + return self._get_data_field(ip, 'continent') def getContinentName(self, ip): - return self.db.get(ip)['continent_name'] + return self._get_data_field(ip, 'continent_name') def getASN(self, ip): - return self.db.get(ip)['asn'] + return self._get_data_field(ip, 'asn') def getASNName(self, ip): - return self.db.get(ip)['as_name'] + return self._get_data_field(ip, 'as_name') def getASNDomain(self, ip): - return self.db.get(ip)['as_domain'] + return self._get_data_field(ip, 'as_domain') + + def _get_data_field(self, ip, field): + data = self.db.get(ip) + return data[field] if data else _no_data_error(ip) + +# helper function to return error message. +def _no_data_error(ip): + return f"err: couldn't get data for {ip}" + diff --git a/requirements.txt b/requirements.txt index e3b18ae..8a39101 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +appdirs==1.4.4 exceptiongroup==1.1.1 iniconfig==2.0.0 maxminddb==2.3.0 diff --git a/setup.py b/setup.py index 0bab94a..46712f1 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from ipinfodb.version import SDK_VERSION long_description = """ -The official Python free database library for IPinfo. +The official Python free database library for IPInfo. IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. From 5f74310cea1814e11b2aa816d24040d6858d5dae Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Fri, 12 May 2023 10:39:51 +0500 Subject: [PATCH 09/10] changed case of ipinfo --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 46712f1..1b45281 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from ipinfodb.version import SDK_VERSION long_description = """ -The official Python free database library for IPInfo. +The official Python free database library for IPinfo. IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. @@ -13,7 +13,7 @@ setup( name="ipinfodb", version=SDK_VERSION, - description="Official Python free database library for IPInfo", + description="Official Python free database library for IPinfo", long_description=long_description, url="https://github.com/ipinfo/python-db", author="IPinfo", From e83e5ff0109754a51f8c42bae6429caebdc8b9a4 Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Fri, 12 May 2023 11:57:39 +0500 Subject: [PATCH 10/10] return None if no data --- ipinfodb/client.py | 9 ++------- tests/test_all.py | 4 ++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ipinfodb/client.py b/ipinfodb/client.py index 48318a4..eedcac1 100644 --- a/ipinfodb/client.py +++ b/ipinfodb/client.py @@ -37,7 +37,7 @@ def __init__(self, access_token=None, path=None, replace=False): self.db = maxminddb.open_database(self.path) def getDetails(self, ip): - return self.db.get(ip) or _no_data_error(ip) + return self.db.get(ip) def getCountry(self, ip): return self._get_data_field(ip, 'country') @@ -62,9 +62,4 @@ def getASNDomain(self, ip): def _get_data_field(self, ip, field): data = self.db.get(ip) - return data[field] if data else _no_data_error(ip) - -# helper function to return error message. -def _no_data_error(ip): - return f"err: couldn't get data for {ip}" - + return data[field] if data else None diff --git a/tests/test_all.py b/tests/test_all.py index d25e21e..9d6327b 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -25,3 +25,7 @@ def test_get_asn_name(): def test_get_asn_domain(): assert(client.getASNDomain('8.8.8.8'),"google.com") + +def test_no_ip_details(): + assert(client.getDetails('127.0.0.1'), None) + assert(client.getCountry('127.0.0.1'), None)