apccapi 0.0.1__tar.gz → 0.1.0__tar.gz

{apccapi-0.0.1 → apccapi-0.1.0}/PKG-INFO

@@ -1,84 +1,96 @@
-Metadata-Version: 2.1
-Name: apccapi
-Version: 0.0.1
-Summary: APCC Climate Information toolKit API package
-Home-page: https://www.apcc21.org
-Author: APEC Climate Center
-Author-email: joohyung@apcc21.org
-Project-URL: CLIK, https://cliks.apcc21.org
-Keywords: APCC,apcc,Climate,Climate Information,Climate API
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: requests
-Requires-Dist: urllib3
-
-## Installation
-
-Install via pip with:
-
-```bash
-$ pip install apccapi
-```
-
-## Configure (Linux)
-
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org and enter it into the apccapi.properties file, formatting it as follows:
-
-```
-$ vi ~/.apccapi.properties
-
-key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
-```
-
-## Configure (Windows)
-
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
-
-```
-key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
-```
-
-## Test
-
-Perform a small test retrieve of MME data:
-```
-$ python
->>> import apccapi
->>> c = apccapi.Client()
->>> c.retrieve(
-	{
-		'jobtype': 'MME',
-		'dataset': 'MME_3MONTH',
-		'type': 'FORECAST',
-		'method': 'SCM',
-		'variable': ['prec', 't2m'],
-		'period': ['Monthly mean'],
-		'yearmonth': ['201909']
-	},
-	'mme3.zip'
-)
->>>
-
-```
-
-## License
-
-MIT License
-
-Copyright (c) 2019 - 2024, APEC Climate Center
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Metadata-Version: 2.4
+Name: apccapi
+Version: 0.1.0
+Summary: APCC Climate Information toolKit API package
+Home-page: https://www.apcc21.org
+Author: APEC Climate Center
+Author-email: joohyung@apcc21.org
+Project-URL: CLIK, https://apcc21.org/clik/
+Keywords: APCC,apcc,Climate,Climate Information,Climate API
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: urllib3<2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+## Installation
+
+Install via pip with:
+
+```bash
+$ pip install apccapi
+```
+
+## Configure (Linux)
+
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/ and enter it into the apccapi.properties file, formatting it as follows:
+
+```
+$ vi ~/apccapi.properties
+
+key={your API key}
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
+```
+
+## Configure (Windows)
+
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
+
+```
+key={your API key}
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
+```
+
+## Test
+
+Perform a small test retrieve of MME data:
+```
+$ python
+>>> import apccapi
+>>> c = apccapi.Client()
+>>> c.retrieve(
+	{
+		'jobtype': 'MME',
+		'dataset': 'MME_3MONTH',
+		'type': 'FORECAST',
+		'method': 'SCM',
+		'variable': ['prec', 't2m'],
+		'period': ['Monthly mean'],
+		'yearmonth': ['201909']
+	},
+	'mme3.zip'
+)
+>>>
+
+```
+
+## License
+
+MIT License
+
+Copyright (c) 2019 - 2024, APEC Climate Center
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{apccapi-0.0.1 → apccapi-0.1.0}/README.md

@@ -8,24 +8,24 @@ $ pip install apccapi
 
 ## Configure (Linux)
 
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org and enter it into the apccapi.properties file, formatting it as follows:
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/ and enter it into the apccapi.properties file, formatting it as follows:
 
 ```
-$ vi ~/.apccapi.properties
+$ vi ~/apccapi.properties
 
 key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
 ```
 
 ## Configure (Windows)
 
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
 
 ```
 key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
 ```
 
 ## Test

apccapi-0.1.0/apccapi/__init__.py

@@ -0,0 +1,16 @@
+from .client import (
+	Client,
+	ClikApiError,
+	download_MME_3MONTH,
+	download_MME_6MONTH,
+	download_MME_MODEL,
+	download_CMIP5,
+	download_ERA5,
+	download_NCEP1,
+	download_NCEP2,
+)
+from .clipping import ClippingClient
+from . import clipping
+
+__version__ = '0.1.0'
+__author__ = 'APEC Climate Center'

apccapi-0.0.1/apccapi/apccapi.py → apccapi-0.1.0/apccapi/client.py

@@ -3,21 +3,23 @@ import time
 import os
 import requests
 import logging
-import urllib3
+
+class ClikApiError(Exception):
+	pass
 
 def read_config(path):
 	config = {}
 	with open(path) as f:
 		for l in f.readlines():
 			if '=' in l:
-				k, v = l.strip().split('=')	
+				k, v = l.strip().split('=', 1)	
 				if k in ('request_url', 'key', 'status_url'):
 					config[k] = v.strip()
 	return config
 
 def download_MME_3MONTH(request, output_zipfile_name):
 	client = Client()
-	client.retrieve(
+	return client.retrieve(
 		{
 				'jobtype': 'MME',
 				'dataset': 'MME_3MONTH',
@@ -29,11 +31,10 @@ def download_MME_3MONTH(request, output_zipfile_name):
 			},
 			output_zipfile_name
 	)
-	return output_zipfile_name
 
 def download_MME_6MONTH(request, output_zipfile_name):
 	client = Client()
-	client.retrieve(
+	return client.retrieve(
 		{
 			'jobtype': 'MME',
 			'dataset': 'MME_6MONTH',
@@ -45,11 +46,10 @@ def download_MME_6MONTH(request, output_zipfile_name):
 		},
 		output_zipfile_name
 	)
-	return output_zipfile_name
 
 def download_MME_MODEL(request, output_zipfile_name):
 	client = Client()
-	client.retrieve(
+	return client.retrieve(
 		{
 			'jobtype': 'MODEL',
 			'dataset': 'MODEL',
@@ -61,11 +61,10 @@ def download_MME_MODEL(request, output_zipfile_name):
 		},
 		output_zipfile_name
 	)
-	return output_zipfile_name
 
 def download_CMIP5(request, output_zipfile_name):
 	client = Client()
-	client.retrieve(
+	return client.retrieve(
 		{
 			'jobtype': 'CMIP5',
 			'dataset': 'CMIP5',
@@ -73,7 +72,50 @@ def download_CMIP5(request, output_zipfile_name):
 		},
 		output_zipfile_name
 	)
-	return output_zipfile_name
+
+def download_ERA5(request, output_zipfile_name):
+	# request: timestep ('DAILY'|'MONTHLY'|'HOURLY'), level ('pressure'|'single'),
+	# variable, year (YYYY), month (MM) - required for DAILY/HOURLY, omitted for MONTHLY
+	client = Client()
+	payload = {
+		'jobtype': 'ERA5',
+		'dataset': 'ERA5',
+		'timestep': request['timestep'],
+		'level': request['level'],
+		'variable': request['variable'],
+		'year': request['year']
+	}
+	if request['timestep'] != 'MONTHLY':
+		payload['month'] = request['month']
+	return client.retrieve(payload, output_zipfile_name)
+
+def download_NCEP1(request, output_zipfile_name):
+	# request: timestep ('DAILY'|'MONTHLY'), level, variable, year (YYYY) - required for DAILY only
+	client = Client()
+	payload = {
+		'jobtype': 'NCEP1',
+		'dataset': 'NCEP1',
+		'timestep': request['timestep'],
+		'level': request['level'],
+		'variable': request['variable']
+	}
+	if request['timestep'] == 'DAILY':
+		payload['year'] = request['year']
+	return client.retrieve(payload, output_zipfile_name)
+
+def download_NCEP2(request, output_zipfile_name):
+	# request: timestep ('DAILY'|'MONTHLY'), level, variable, year (YYYY) - required for DAILY only
+	client = Client()
+	payload = {
+		'jobtype': 'NCEP2',
+		'dataset': 'NCEP2',
+		'timestep': request['timestep'],
+		'level': request['level'],
+		'variable': request['variable']
+	}
+	if request['timestep'] == 'DAILY':
+		payload['year'] = request['year']
+	return client.retrieve(payload, output_zipfile_name)
 
 class Client(object):
 	logger = logging.getLogger('apccapi')
@@ -98,25 +140,22 @@ class Client(object):
 		logging.basicConfig(level=level, 
 			format='[%(asctime)s] [%(levelname)s] %(message)s')	
 
-		self.requesturl = None
+		self.request_url = None
 		self.key = None
-		self.statusurl = None
+		self.status_url = None
 
-		urllib3.disable_warnings()
-		
-		propertyFile = os.path.join(os.path.expanduser('~'), 'apccapi.properties')
-		self.debug(propertyFile)
+		property_file = os.path.join(os.path.expanduser('~'), 'apccapi.properties')
+		self.debug(property_file)
 
-		if self.requesturl is None or self.key is None or self.statusurl is None:
-			if os.path.exists(propertyFile):
-				config = read_config(propertyFile)
+		if os.path.exists(property_file):
+			config = read_config(property_file)
 
-				self.key = config.get('key')
-				self.requesturl = config.get('request_url')
-				self.statusurl = config.get('status_url')
+			self.key = config.get('key')
+			self.request_url = config.get('request_url')
+			self.status_url = config.get('status_url')
 
-		if self.requesturl is None or self.key is None or self.statusurl is None:
-			raise Exception('Missing/incomplete properties file: %s' % (propertyFile))
+		if self.request_url is None or self.key is None or self.status_url is None:
+			raise ClikApiError('Missing/incomplete properties file: %s' % (property_file))
 
 	
 	def retrieve(self, details, target):
@@ -127,20 +166,17 @@ class Client(object):
 
 		self.target = target
 
-		try:
-			response = self.post_api(self.requesturl, request)
-			print(response)
-			reply = response.json()
-			status_code = reply['status']
-			message = reply['message']
-		except Exception:
-#			self.debug(response.text)
-			raise
-	
+		response = self.post_api(self.request_url, request)
+		if response is None:
+			raise ClikApiError('Failed to submit request after %s attempts' % self.retry_max)
+
+		reply = response.json()
+		status_code = reply['status']
+		message = reply['message']
+
 		if status_code > 202:
 			info = reply['data']['info']
-			self.error(message + "-" + info)
-			return None
+			raise ClikApiError(message + ": " + info)
 
 		sleep = 0
 		jobid = None
@@ -163,34 +199,33 @@ class Client(object):
 				self.debug("Done")
 				result = self.download(reply['data']['download_url'], self.target)
 				if result is False:
-					self.error('Failed to download result file.')
+					raise ClikApiError('Failed to download result file: %s' % self.target)
 
-				return
+				return self.target
 
 			if reply['data']['status'] == 'Queued' or reply['data']['status'] == 'Running':
 				self.debug("Request ID is %s, sleep %s", jobid, sleep)
 				time.sleep(3)
-				sleep += 3;
+				sleep += 3
 
 				if sleep > self.sleep_max:
 					sleep = self.sleep_max
 
-				status_url = '%s/%s' % (self.statusurl, jobid)
+				status_url = '%s/%s' % (self.status_url, jobid)
 				self.debug("GET %s", status_url)
 
-				try:
-					response = self.get_api(status_url)
-					reply = response.json()
-				except Exception:
-					self.debug("Failed to get response. Retrying");	
+				response = self.get_api(status_url)
+				if response is None:
+					raise ClikApiError('Failed to get job status after %s attempts' % self.retry_max)
+
+				reply = response.json()
 
 				continue
 
 			if reply['data']['status'] == "Failed":
-				print(reply['data']['message'])
-				return
+				raise ClikApiError(reply['data']['message'])
 
-			raise Exception('Unknown API state [%s]' % reply['data']['status'])
+			raise ClikApiError('Unknown API state [%s]' % reply['data']['status'])
 
 	def download(self, url, target):
 		self.info('Start to save file - ' + target)
@@ -199,11 +234,12 @@ class Client(object):
 
 		while tries < self.retry_max:
 			try:
-				response = requests.get(url, verify=False, allow_redirects=True)
-				open(target, 'wb').write(response.content)
-			except requests.exceptions.ConnectionError as e:
-				self.warning("Recovering from connection error [%s], attemps %s of %s",
-					response.status_code, response.reason, tries, self.retry_max)
+				response = requests.get(url, allow_redirects=True, timeout=self.timeout)
+				with open(target, 'wb') as f:
+					f.write(response.content)
+			except requests.exceptions.RequestException as e:
+				self.warning("Recovering from connection error [%s], attempt %s of %s",
+					e, tries, self.retry_max)
 
 			if os.path.exists(target):
 				self.info('Done')
@@ -223,18 +259,21 @@ class Client(object):
 
 		while tries < self.retry_max:
 			try:
-				response = requests.get(url, verify=False)
-			except requests.exceptions.ConnectionError as e:
+				response = requests.get(url, timeout=self.timeout)
+			except requests.exceptions.RequestException as e:
 				response = None
-				self.warning("Recovering from connection error [%s], attemps %s of %s",
-							response.status_code, response.reason, tries, self.retry_max)
+				self.warning("Recovering from connection error [%s], attempt %s of %s",
+							e, tries, self.retry_max)
 
-			if response	is not None:
+			if response is not None:
 				if response.status_code == 202 or response.status_code == 200:
 					return response
 				else:
 					self.error('Failed to get status of the job.')
-					self.error(response['data']['info'])
+					try:
+						self.error(response.json()['data']['info'])
+					except ValueError:
+						self.error(response.text)
 
 			tries += 1
 
@@ -251,15 +290,15 @@ class Client(object):
 
 		while tries < self.retry_max:
 			try:
-				response = requests.post(url, verify=False, headers=headers, data=json.dumps(request))
-			except requests.exceptions.ConnectionError as e:
+				response = requests.post(url, headers=headers, data=json.dumps(request), timeout=self.timeout)
+			except requests.exceptions.RequestException as e:
 				response = None
-				self.warning("Recovering from connection error [%s], attemps %s of %s",
+				self.warning("Recovering from connection error [%s], attempt %s of %s",
 							 e, tries, self.retry_max)
 
-			if response	is not None:
+			if response is not None:
 				if response.status_code > 202:
-					self.warning("Recovering from HTTP error [%s %s], attemps %s of %s",
+					self.warning("Recovering from HTTP error [%s %s], attempt %s of %s",
 							response.status_code, response.reason, tries, self.retry_max)
 				else:
 					return response				

apccapi-0.1.0/apccapi/clipping.py

@@ -0,0 +1,130 @@
+import json
+import requests
+import logging
+import os
+import math
+
+class ClippingClient(object):
+	logger = logging.getLogger('clipsapi')
+	api_server_url = 'https://processingapi.apcc21.org'
+	result_server_url = 'https://processingresult.apcc21.org'
+
+	def __init__(self, debug=False, retry_max=500, timeout=60):
+		self.retry_max = retry_max
+		self.timeout = timeout
+		self.last_status = None
+		self.target = None
+		if debug:
+			level = logging.DEBUG
+		else:
+			level = logging.INFO
+			
+		logging.basicConfig(level=level, format='[%(asctime)s] [%(levelname)s] %(message)s')
+		
+	def clip(self, detail):
+
+		headers = {'Content-Type': 'application/json; charset-utf-8'}	
+		return_type = detail['return_type']
+		output_file_name = self.generate_file_name(detail)
+		
+		if return_type == 'png':
+			api_url = self.api_server_url + '/clip-mme'
+			output_file_name = output_file_name + '.png'
+		elif return_type == 'nc':
+			api_url = self.api_server_url + '/clip-mme-to-nc'
+			output_file_name = output_file_name + '.zip'
+		else:
+			print("Error : Invalid File Extension")
+			return False
+		
+		json_data = json.dumps(detail)
+		
+		self.print_clipping_detail(detail, output_file_name)
+		
+		tries = 0
+		
+		while tries < self.retry_max:
+			try:
+				response = requests.post(api_url, data=json_data, headers=headers, timeout=self.timeout)
+				if response.status_code == 200:
+					json_result = json.loads(response.content)
+					print(json_result)
+				else:
+					print("Error: ", response.status_code)
+					return False
+					
+				try:
+					if isinstance(json_result, list):
+						file_urls = json_result
+					else:
+						file_urls = json.loads(json_result)
+				except json.JSONDecodeError:
+					file_urls = []
+					file_urls.append(self.result_server_url + "/" + json_result)
+			
+				for file_url in file_urls:
+					response = requests.get(file_url, allow_redirects=True, timeout=self.timeout)
+					filename = file_url.split("/")[-1]
+	
+					with open(filename, 'wb') as f:
+						f.write(response.content)
+					if os.path.exists(filename):
+						print(filename + " download complete!")
+	
+				return True
+				
+			except requests.exceptions.RequestException as e:
+				self.warning("Recovering from connection error [%s], attempt %s of %s",
+					e, tries, self.retry_max)
+
+			tries += 1
+
+		return False
+
+	def info(self, *args, **kwargs):
+		self.logger.info(*args, **kwargs)
+
+	def warning(self, *args, **kwargs):
+		self.logger.warning(*args, **kwargs)
+
+	def error(self, *args, **kwargs):
+		self.logger.error(*args, **kwargs)
+
+	def debug(self, *args, **kwargs):
+		self.logger.debug(*args, **kwargs)
+
+	def generate_file_name(self, detail):
+		variable = detail['variable'] 
+		lead_month = detail['lead_month'] 
+		method = detail['method'] 
+		period = detail['period'].strip().replace(' mean', '')
+		year = detail['iyear']
+		month = detail['imonth']
+		south = detail['cosouth']
+		north = detail['conorth']
+		west = detail['cowest']
+		east = detail['coeast']
+
+		file_name = "clipped_APCC_MME_" + lead_month + "_" + variable + "_" + method + "_" + year + "_" + month + "_" + south + "_" + north + "_" + west + "_" + east + "_" + period
+		
+		return file_name
+		
+	def print_clipping_detail(self, detail, file_name):
+		print('Start to save file - ' + file_name)
+		print()
+		print("Model")
+		print("Lead Month : " + detail['lead_month'])
+		print("Variable : " + detail['variable'])
+		print("Method : " + detail['method'])
+		print("Period : " + detail['period'])
+		print("Issued Year : " + detail['iyear'])
+		print("Issued Month : " + detail['imonth'])
+		print()
+		print("Coordinate")
+		print("Min Latitude : " + detail['cosouth'])
+		print("Max Latitude : " + detail['conorth'])
+		print("Min longitude : " + detail['cowest'])
+		print("Max longitude : " + detail['coeast'])
+		print()
+		
+		return True

{apccapi-0.0.1 → apccapi-0.1.0}/apccapi.egg-info/PKG-INFO

@@ -1,84 +1,96 @@
-Metadata-Version: 2.1
-Name: apccapi
-Version: 0.0.1
-Summary: APCC Climate Information toolKit API package
-Home-page: https://www.apcc21.org
-Author: APEC Climate Center
-Author-email: joohyung@apcc21.org
-Project-URL: CLIK, https://cliks.apcc21.org
-Keywords: APCC,apcc,Climate,Climate Information,Climate API
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: requests
-Requires-Dist: urllib3
-
-## Installation
-
-Install via pip with:
-
-```bash
-$ pip install apccapi
-```
-
-## Configure (Linux)
-
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org and enter it into the apccapi.properties file, formatting it as follows:
-
-```
-$ vi ~/.apccapi.properties
-
-key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
-```
-
-## Configure (Windows)
-
-Obtain your API key from the CLIK (Climate Information toolKit) at https://cliks.apcc21.org, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
-
-```
-key={your API key}
-request_url=https://request.apcc21.org/apccdata
-status_url=https://request.apcc21.org/status
-```
-
-## Test
-
-Perform a small test retrieve of MME data:
-```
-$ python
->>> import apccapi
->>> c = apccapi.Client()
->>> c.retrieve(
-	{
-		'jobtype': 'MME',
-		'dataset': 'MME_3MONTH',
-		'type': 'FORECAST',
-		'method': 'SCM',
-		'variable': ['prec', 't2m'],
-		'period': ['Monthly mean'],
-		'yearmonth': ['201909']
-	},
-	'mme3.zip'
-)
->>>
-
-```
-
-## License
-
-MIT License
-
-Copyright (c) 2019 - 2024, APEC Climate Center
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Metadata-Version: 2.4
+Name: apccapi
+Version: 0.1.0
+Summary: APCC Climate Information toolKit API package
+Home-page: https://www.apcc21.org
+Author: APEC Climate Center
+Author-email: joohyung@apcc21.org
+Project-URL: CLIK, https://apcc21.org/clik/
+Keywords: APCC,apcc,Climate,Climate Information,Climate API
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: urllib3<2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+## Installation
+
+Install via pip with:
+
+```bash
+$ pip install apccapi
+```
+
+## Configure (Linux)
+
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/ and enter it into the apccapi.properties file, formatting it as follows:
+
+```
+$ vi ~/apccapi.properties
+
+key={your API key}
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
+```
+
+## Configure (Windows)
+
+Obtain your API key from the CLIK (Climate Information toolKit) at https://apcc21.org/clik/, and create the apccapi.properties file in your Windows Home directory (typically C:\Users\YourUserName) with the following format:
+
+```
+key={your API key}
+request_url=https://apcc21.org/clikapi/request/apccdata
+status_url=https://apcc21.org/clikapi/request/status
+```
+
+## Test
+
+Perform a small test retrieve of MME data:
+```
+$ python
+>>> import apccapi
+>>> c = apccapi.Client()
+>>> c.retrieve(
+	{
+		'jobtype': 'MME',
+		'dataset': 'MME_3MONTH',
+		'type': 'FORECAST',
+		'method': 'SCM',
+		'variable': ['prec', 't2m'],
+		'period': ['Monthly mean'],
+		'yearmonth': ['201909']
+	},
+	'mme3.zip'
+)
+>>>
+
+```
+
+## License
+
+MIT License
+
+Copyright (c) 2019 - 2024, APEC Climate Center
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{apccapi-0.0.1 → apccapi-0.1.0}/apccapi.egg-info/SOURCES.txt

@@ -2,7 +2,8 @@ LICENSE
 README.md
 setup.py
 apccapi/__init__.py
-apccapi/apccapi.py
+apccapi/client.py
+apccapi/clipping.py
 apccapi.egg-info/PKG-INFO
 apccapi.egg-info/SOURCES.txt
 apccapi.egg-info/dependency_links.txt

apccapi-0.1.0/apccapi.egg-info/requires.txt

@@ -0,0 +1,2 @@
+requests
+urllib3<2

{apccapi-0.0.1 → apccapi-0.1.0}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{apccapi-0.0.1 → apccapi-0.1.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="apccapi",
-    version="0.0.1",
+    version="0.1.0",
     author="APEC Climate Center",
     author_email="joohyung@apcc21.org",
     description="APCC Climate Information toolKit API package",
@@ -24,9 +24,9 @@ setuptools.setup(
     ],
     install_requires=[
         'requests',
-        'urllib3',
+        'urllib3<2',
     ],
     project_urls={
-        "CLIK": "https://cliks.apcc21.org",
+        "CLIK": "https://apcc21.org/clik/",
     },
 )

apccapi-0.0.1/apccapi/__init__.py

@@ -1,5 +0,0 @@
-import apccapi
-Client = apccapi.Client
-__version__ = '0.0.1'
-__author__ = 'APEC Climate Center'
-print(apccapi.__version__)

apccapi-0.0.1/apccapi.egg-info/requires.txt

@@ -1,2 +0,0 @@
-requests
-urllib3